equal
deleted
inserted
replaced
318 # (2) if the new heads have ancestors which are not obsolete and |
318 # (2) if the new heads have ancestors which are not obsolete and |
319 # not ancestors of any other heads we will have a new head too. |
319 # not ancestors of any other heads we will have a new head too. |
320 # |
320 # |
321 # These two cases will be easy to handle for known changeset but |
321 # These two cases will be easy to handle for known changeset but |
322 # much more tricky for unsynced changes. |
322 # much more tricky for unsynced changes. |
|
323 # |
|
324 # In addition, this code is confused by prune as it only looks for |
|
325 # successors of the heads (none if pruned) leading to issue4354 |
323 newhs = set() |
326 newhs = set() |
324 for nh in candidate_newhs: |
327 for nh in candidate_newhs: |
325 if nh in repo and repo[nh].phase() <= phases.public: |
328 if nh in repo and repo[nh].phase() <= phases.public: |
326 newhs.add(nh) |
329 newhs.add(nh) |
327 else: |
330 else: |