Skip to content
Snippets Groups Projects

pick: don't create any successors when there were no changes (issue6093)

Merged Anton Shestakov requested to merge topic/stable/pick-no-changes into branch/stable
3 files
+ 21
2
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -1519,8 +1519,11 @@ def cmdpick(ui, repo, *revs, **opts):
if pickstate:
pickstate.delete()
newctx = repo[newnode] if newnode else pctx
replacements = {origctx.node(): [newctx.node()]}
if newnode is None:
replacements = {origctx.node(): []}
else:
newctx = repo[newnode]
replacements = {origctx.node(): [newctx.node()]}
scmutil.cleanupnodes(repo, replacements, operation=b"pick")
if newnode is None:
Loading