Show More
@@ -563,6 +563,9 b' def _fullcopytracing(repo, c1, c2, base)' | |||||
563 | copies1 = pathcopies(base, c1) |
|
563 | copies1 = pathcopies(base, c1) | |
564 | copies2 = pathcopies(base, c2) |
|
564 | copies2 = pathcopies(base, c2) | |
565 |
|
565 | |||
|
566 | if not (copies1 or copies2): | |||
|
567 | return {}, {}, {}, {}, {} | |||
|
568 | ||||
566 | inversecopies1 = {} |
|
569 | inversecopies1 = {} | |
567 | inversecopies2 = {} |
|
570 | inversecopies2 = {} | |
568 | for dst, src in copies1.items(): |
|
571 | for dst, src in copies1.items(): | |
@@ -632,8 +635,6 b' def _fullcopytracing(repo, c1, c2, base)' | |||||
632 |
|
635 | |||
633 | fullcopy = copies1.copy() |
|
636 | fullcopy = copies1.copy() | |
634 | fullcopy.update(copies2) |
|
637 | fullcopy.update(copies2) | |
635 | if not fullcopy: |
|
|||
636 | return copy, {}, diverge, renamedelete, {} |
|
|||
637 |
|
638 | |||
638 | if repo.ui.debugflag: |
|
639 | if repo.ui.debugflag: | |
639 | repo.ui.debug( |
|
640 | repo.ui.debug( |
@@ -52,8 +52,6 b' Create extension that can disable exec c' | |||||
52 | Simulate a Windows merge: |
|
52 | Simulate a Windows merge: | |
53 |
|
53 | |||
54 | $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug |
|
54 | $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug | |
55 | unmatched files in local: |
|
|||
56 | b |
|
|||
57 | resolving manifests |
|
55 | resolving manifests | |
58 | branchmerge: True, force: False, partial: False |
|
56 | branchmerge: True, force: False, partial: False | |
59 | ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 |
|
57 | ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 |
@@ -25,8 +25,6 b' revision.' | |||||
25 | $ hg ci -qAm 'add bar' |
|
25 | $ hg ci -qAm 'add bar' | |
26 |
|
26 | |||
27 | $ hg merge --debug |
|
27 | $ hg merge --debug | |
28 | unmatched files in local: |
|
|||
29 | bar |
|
|||
30 | resolving manifests |
|
28 | resolving manifests | |
31 | branchmerge: True, force: False, partial: False |
|
29 | branchmerge: True, force: False, partial: False | |
32 | ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee |
|
30 | ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee |
@@ -410,11 +410,6 b' Verify that the old context ancestor wor' | |||||
410 | note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e |
|
410 | note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e | |
411 |
|
411 | |||
412 | calculating bids for ancestor 11b5b303e36c |
|
412 | calculating bids for ancestor 11b5b303e36c | |
413 | unmatched files in local: |
|
|||
414 | d1/a |
|
|||
415 | d1/b |
|
|||
416 | unmatched files in other: |
|
|||
417 | d2/b |
|
|||
418 | resolving manifests |
|
413 | resolving manifests | |
419 | branchmerge: True, force: False, partial: False |
|
414 | branchmerge: True, force: False, partial: False | |
420 | ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
|
415 | ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
@@ -40,8 +40,6 b'' | |||||
40 | summary: 1 |
|
40 | summary: 1 | |
41 |
|
41 | |||
42 | $ hg --debug up |
|
42 | $ hg --debug up | |
43 | unmatched files in other: |
|
|||
44 | b |
|
|||
45 | resolving manifests |
|
43 | resolving manifests | |
46 | branchmerge: False, force: False, partial: False |
|
44 | branchmerge: False, force: False, partial: False | |
47 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
45 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | |
@@ -91,8 +89,6 b'' | |||||
91 | summary: 1 |
|
89 | summary: 1 | |
92 |
|
90 | |||
93 | $ hg --debug up |
|
91 | $ hg --debug up | |
94 | unmatched files in other: |
|
|||
95 | b |
|
|||
96 | resolving manifests |
|
92 | resolving manifests | |
97 | branchmerge: False, force: False, partial: False |
|
93 | branchmerge: False, force: False, partial: False | |
98 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
94 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
General Comments 0
You need to be logged in to leave comments.
Login now