facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

merge: display modify/delete conflict prompts in sorted order

Browse Source 
The order is determined by manifest.diff(), which currently is not
sorted. There are currently no tests for this, but we will soon add
some that would be flaky without this patch.
This commit is contained in:
Martin von Zweigbergk 2014-11-26 10:25:27 -08:00
parent 06a8686a04
commit 81df1b38d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/merge.py
View File

@ -601,7 +601,7 @@ def calculateupdates(repo, wctx, mctx, ancestors, branchmerge, force, partial,
repo.ui.note(_('end of auction\n\n'))
# Prompt and create actions. TODO: Move this towards resolve phase.
for f, args, msg in actions['cd']:
for f, args, msg in sorted(actions['cd']):
if f in ancestors[0] and not wctx[f].cmp(ancestors[0][f]):
# local did change but ended up with same content
actions['r'].append((f, None, "prompt same"))
@ -614,7 +614,7 @@ def calculateupdates(repo, wctx, mctx, ancestors, branchmerge, force, partial,
actions['a'].append((f, None, "prompt keep"))
del actions['cd'][:]
for f, args, msg in actions['dc']:
for f, args, msg in sorted(actions['dc']):
flags, = args
if f in ancestors[0] and not mctx[f].cmp(ancestors[0][f]):
# remote did change but ended up with same content