##// END OF EJS Templates
merge: make 'diverging renames' diagnostic a more helpful note....
Dan Villiom Podlaski Christiansen -
r12757:62c8f769 default
parent child Browse files
Show More
@@ -355,7 +355,8 b' def applyupdates(repo, action, wctx, mct'
355 updated += 1
355 updated += 1
356 elif m == "dr": # divergent renames
356 elif m == "dr": # divergent renames
357 fl = a[2]
357 fl = a[2]
358 repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
358 repo.ui.warn(_("note: possible conflict - %s was renamed "
359 "multiple times to:\n") % f)
359 for nf in fl:
360 for nf in fl:
360 repo.ui.warn(" %s\n" % nf)
361 repo.ui.warn(" %s\n" % nf)
361 elif m == "e": # exec
362 elif m == "e": # exec
@@ -340,7 +340,7 b' revision 4'
340
340
341 $ cd ../test
341 $ cd ../test
342 $ hg merge 7
342 $ hg merge 7
343 warning: detected divergent renames of afile to:
343 note: possible conflict - afile was renamed multiple times to:
344 anotherfile
344 anotherfile
345 adifferentfile
345 adifferentfile
346 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
346 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -13,7 +13,7 b' http://mercurial.selenic.com/bts/issue11'
13
13
14 $ hg mv a a2
14 $ hg mv a a2
15 $ hg up
15 $ hg up
16 warning: detected divergent renames of a to:
16 note: possible conflict - a was renamed multiple times to:
17 a2
17 a2
18 a1
18 a1
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -47,7 +47,7 b''
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
48 premerge successful
48 premerge successful
49 updating: a2 2/3 files (66.67%)
49 updating: a2 2/3 files (66.67%)
50 warning: detected divergent renames of a2 to:
50 note: possible conflict - a2 was renamed multiple times to:
51 c2
51 c2
52 b2
52 b2
53 updating: b2 3/3 files (100.00%)
53 updating: b2 3/3 files (100.00%)
@@ -95,7 +95,7 b" We'd rather not warn on divergent rename"
95 $ hg up c761c6948de0
95 $ hg up c761c6948de0
96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
97 $ hg up
97 $ hg up
98 warning: detected divergent renames of b to:
98 note: possible conflict - b was renamed multiple times to:
99 b3
99 b3
100 b4
100 b4
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -383,7 +383,7 b' m "um a c" "um x c" " " "10 do merg'
383 c: remote created -> g
383 c: remote created -> g
384 preserving rev for resolve of rev
384 preserving rev for resolve of rev
385 updating: a 1/3 files (33.33%)
385 updating: a 1/3 files (33.33%)
386 warning: detected divergent renames of a to:
386 note: possible conflict - a was renamed multiple times to:
387 b
387 b
388 c
388 c
389 updating: c 2/3 files (66.67%)
389 updating: c 2/3 files (66.67%)
General Comments 0
You need to be logged in to leave comments. Login now