Show More
@@ -228,7 +228,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
228 | break |
|
228 | break | |
229 |
|
229 | |||
230 | # Compare manifests |
|
230 | # Compare manifests | |
231 | for f, n in m1.iteritems(): |
|
231 | for f, n in sorted(m1.iteritems()): | |
232 | if partial and not partial(f): |
|
232 | if partial and not partial(f): | |
233 | continue |
|
233 | continue | |
234 | if f in m2: |
|
234 | if f in m2: | |
@@ -274,7 +274,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
274 | else: |
|
274 | else: | |
275 | act("other deleted", "r", f) |
|
275 | act("other deleted", "r", f) | |
276 |
|
276 | |||
277 | for f, n in m2.iteritems(): |
|
277 | for f, n in sorted(m2.iteritems()): | |
278 | if partial and not partial(f): |
|
278 | if partial and not partial(f): | |
279 | continue |
|
279 | continue | |
280 | if f in m1 or f in copied: # files already visited |
|
280 | if f in m1 or f in copied: # files already visited |
@@ -31,8 +31,8 b'' | |||||
31 | resolving manifests |
|
31 | resolving manifests | |
32 | overwrite: False, partial: False |
|
32 | overwrite: False, partial: False | |
33 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
|
33 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 | |
|
34 | a: remote moved to b -> m | |||
34 | a: remote moved to c -> m |
|
35 | a: remote moved to c -> m | |
35 | a: remote moved to b -> m |
|
|||
36 | preserving a for resolve of b |
|
36 | preserving a for resolve of b | |
37 | preserving a for resolve of c |
|
37 | preserving a for resolve of c | |
38 | removing a |
|
38 | removing a |
@@ -158,8 +158,8 b' Graft out of order, skipping a merge and' | |||||
158 | resolving manifests |
|
158 | resolving manifests | |
159 | overwrite: False, partial: False |
|
159 | overwrite: False, partial: False | |
160 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
|
160 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d | |
|
161 | d: remote is newer -> g | |||
161 | e: versions differ -> m |
|
162 | e: versions differ -> m | |
162 | d: remote is newer -> g |
|
|||
163 | preserving e for resolve of e |
|
163 | preserving e for resolve of e | |
164 | updating: d 1/2 files (50.00%) |
|
164 | updating: d 1/2 files (50.00%) | |
165 | getting d |
|
165 | getting d |
@@ -39,9 +39,9 b'' | |||||
39 | resolving manifests |
|
39 | resolving manifests | |
40 | overwrite: False, partial: False |
|
40 | overwrite: False, partial: False | |
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
|
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 | |
42 | a/c: remote renamed directory to b/c -> d |
|
42 | a/a: other deleted -> r | |
43 | a/b: other deleted -> r |
|
43 | a/b: other deleted -> r | |
44 | a/a: other deleted -> r |
|
44 | a/c: remote renamed directory to b/c -> d | |
45 | b/a: remote created -> g |
|
45 | b/a: remote created -> g | |
46 | b/b: remote created -> g |
|
46 | b/b: remote created -> g | |
47 | updating: a/a 1/5 files (20.00%) |
|
47 | updating: a/a 1/5 files (20.00%) |
@@ -68,8 +68,8 b'' | |||||
68 | resolving manifests |
|
68 | resolving manifests | |
69 | overwrite: True, partial: False |
|
69 | overwrite: True, partial: False | |
70 | ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
|
70 | ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf | |
|
71 | side1: other deleted -> r | |||
71 | side2: other deleted -> r |
|
72 | side2: other deleted -> r | |
72 | side1: other deleted -> r |
|
|||
73 | main: remote created -> g |
|
73 | main: remote created -> g | |
74 | updating: side1 1/3 files (33.33%) |
|
74 | updating: side1 1/3 files (33.33%) | |
75 | removing side1 |
|
75 | removing side1 |
General Comments 0
You need to be logged in to leave comments.
Login now