Submitter | phabricator |
---|---|
Date | July 10, 2019, 9:41 p.m. |
Message ID | <differential-rev-PHID-DREV-7fg4qur6ccwywekkbxqi-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/40903/ |
State | Superseded |
Headers | show |
Comments
pulkit added a comment. > However when merge is aborted there is no unresolved merge in progress and hence This needs to be reworded. > no labels are required. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6638/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6638 To: taapas1128, #hg-reviewers Cc: pulkit, mercurial-devel
taapas1128 added a comment. Updated that is it fine now ? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6638/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6638 To: taapas1128, #hg-reviewers Cc: pulkit, mercurial-devel
Patch
diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -957,7 +957,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if abort: - return abortmerge(repo.ui, repo, labels=labels) + return abortmerge(repo.ui, repo) stats = mergemod.update(repo, node, branchmerge=True, force=force, mergeforce=mergeforce, labels=labels) @@ -969,7 +969,7 @@ repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats.unresolvedcount > 0 -def abortmerge(ui, repo, labels=None): +def abortmerge(ui, repo): ms = mergemod.mergestate.read(repo) if ms.active(): # there were conflicts @@ -980,8 +980,7 @@ repo.ui.status(_("aborting the merge, updating back to" " %s\n") % node[:12]) - stats = mergemod.update(repo, node, branchmerge=False, force=True, - labels=labels) + stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0