Mercurial > hg
changeset 21269:fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Make recently introduced messages more useful. Instead of:
f1: g
f2: m
say:
f1: remote is newer -> g
f2: versions differ -> m
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 22 Apr 2014 02:09:24 +0200 |
| parents | a0b8a912ec81 |
| children | 8fd982139740 |
| files | mercurial/merge.py tests/test-merge-criss-cross.t |
| diffstat | 2 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sun May 13 17:45:08 2012 +0200 +++ b/mercurial/merge.py Tue Apr 22 02:09:24 2014 +0200 @@ -762,8 +762,8 @@ branchmerge, force, partial, acceptremote, followcopies) for a in sorted(actions): - repo.ui.debug(' %s: %s\n' % (a[0], a[1])) - f = a[0] + f, m, args, msg = a + repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m)) if f in fbids: fbids[f].append(a) else:
--- a/tests/test-merge-criss-cross.t Sun May 13 17:45:08 2012 +0200 +++ b/tests/test-merge-criss-cross.t Tue Apr 22 02:09:24 2014 +0200 @@ -135,16 +135,16 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 - f1: g - f2: m + f1: remote is newer -> g + f2: versions differ -> m calculating bids for ancestor 40663881a6dd searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 - f1: m - f2: k + f1: versions differ -> m + f2: keep -> k auction for merging merge bids f1: picking 'get' action @@ -180,16 +180,16 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 - f1: k - f2: m + f1: keep -> k + f2: versions differ -> m calculating bids for ancestor 40663881a6dd searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 - f1: m - f2: g + f1: versions differ -> m + f2: remote is newer -> g auction for merging merge bids f1: picking 'keep' action @@ -246,16 +246,16 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 - f1: g - f2: m + f1: remote is newer -> g + f2: versions differ -> m calculating bids for ancestor 40663881a6dd searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 - f1: m - f2: k + f1: versions differ -> m + f2: keep -> k auction for merging merge bids f1: picking 'get' action