Show More
@@ -177,10 +177,16 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
177 | Merge manifest m1 with m2 using ancestor ma and generate merge action list |
|
177 | Merge manifest m1 with m2 using ancestor ma and generate merge action list | |
178 | """ |
|
178 | """ | |
179 |
|
179 | |||
|
180 | repo.ui.note(_("resolving manifests\n")) | |||
|
181 | repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial))) | |||
|
182 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2)) | |||
|
183 | ||||
180 | m1 = p1.manifest() |
|
184 | m1 = p1.manifest() | |
181 | m2 = p2.manifest() |
|
185 | m2 = p2.manifest() | |
182 | ma = pa.manifest() |
|
186 | ma = pa.manifest() | |
183 | backwards = (pa == p2) |
|
187 | backwards = (pa == p2) | |
|
188 | action = [] | |||
|
189 | copy = {} | |||
184 |
|
190 | |||
185 | def fmerge(f, f2=None, fa=None): |
|
191 | def fmerge(f, f2=None, fa=None): | |
186 | """merge executable flags""" |
|
192 | """merge executable flags""" | |
@@ -190,13 +196,10 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
190 | a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2) |
|
196 | a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2) | |
191 | return ((a^b) | (a^c)) ^ a |
|
197 | return ((a^b) | (a^c)) ^ a | |
192 |
|
198 | |||
193 | action = [] |
|
|||
194 |
|
||||
195 | def act(msg, m, f, *args): |
|
199 | def act(msg, m, f, *args): | |
196 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
|
200 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) | |
197 | action.append((f, m) + args) |
|
201 | action.append((f, m) + args) | |
198 |
|
202 | |||
199 | copy = {} |
|
|||
200 | if not (backwards or overwrite): |
|
203 | if not (backwards or overwrite): | |
201 | copy = findcopies(repo, m1, m2, pa.rev()) |
|
204 | copy = findcopies(repo, m1, m2, pa.rev()) | |
202 |
|
205 | |||
@@ -355,70 +358,47 b' def recordupdates(repo, action, branchme' | |||||
355 | def update(repo, node, branchmerge=False, force=False, partial=None, |
|
358 | def update(repo, node, branchmerge=False, force=False, partial=None, | |
356 | wlock=None, show_stats=True, remind=True): |
|
359 | wlock=None, show_stats=True, remind=True): | |
357 |
|
360 | |||
358 | overwrite = force and not branchmerge |
|
|||
359 | forcemerge = force and branchmerge |
|
|||
360 |
|
||||
361 | if not wlock: |
|
361 | if not wlock: | |
362 | wlock = repo.wlock() |
|
362 | wlock = repo.wlock() | |
363 |
|
363 | |||
364 | ### check phase |
|
364 | overwrite = force and not branchmerge | |
365 |
|
365 | forcemerge = force and branchmerge | ||
366 | wc = repo.workingctx() |
|
366 | wc = repo.workingctx() | |
367 | pl = wc.parents() |
|
367 | pl = wc.parents() | |
|
368 | p1, p2 = pl[0], repo.changectx(node) | |||
|
369 | pa = p1.ancestor(p2) | |||
|
370 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | |||
|
371 | ||||
|
372 | ### check phase | |||
368 | if not overwrite and len(pl) > 1: |
|
373 | if not overwrite and len(pl) > 1: | |
369 | raise util.Abort(_("outstanding uncommitted merges")) |
|
374 | raise util.Abort(_("outstanding uncommitted merges")) | |
370 |
|
375 | if pa == p1 or pa == p2: # is there a linear path from p1 to p2? | ||
371 | p1, p2 = pl[0], repo.changectx(node) |
|
|||
372 | pa = p1.ancestor(p2) |
|
|||
373 |
|
||||
374 | # is there a linear path from p1 to p2? |
|
|||
375 | if pa == p1 or pa == p2: |
|
|||
376 | if branchmerge: |
|
376 | if branchmerge: | |
377 | raise util.Abort(_("there is nothing to merge, just use " |
|
377 | raise util.Abort(_("there is nothing to merge, just use " | |
378 | "'hg update' or look at 'hg heads'")) |
|
378 | "'hg update' or look at 'hg heads'")) | |
379 | elif not (overwrite or branchmerge): |
|
379 | elif not (overwrite or branchmerge): | |
380 | raise util.Abort(_("update spans branches, use 'hg merge' " |
|
380 | raise util.Abort(_("update spans branches, use 'hg merge' " | |
381 | "or 'hg update -C' to lose changes")) |
|
381 | "or 'hg update -C' to lose changes")) | |
382 |
|
||||
383 | if branchmerge and not forcemerge: |
|
382 | if branchmerge and not forcemerge: | |
384 | if wc.modified() or wc.added() or wc.removed(): |
|
383 | if wc.modified() or wc.added() or wc.removed(): | |
385 | raise util.Abort(_("outstanding uncommitted changes")) |
|
384 | raise util.Abort(_("outstanding uncommitted changes")) | |
386 |
|
385 | |||
387 | # resolve the manifest to determine which files |
|
386 | ### calculate phase | |
388 | # we care about merging |
|
|||
389 | repo.ui.note(_("resolving manifests\n")) |
|
|||
390 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s\n") % |
|
|||
391 | (overwrite, branchmerge, bool(partial))) |
|
|||
392 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa)) |
|
|||
393 |
|
||||
394 | action = [] |
|
387 | action = [] | |
395 |
|
||||
396 | if not force: |
|
388 | if not force: | |
397 | checkunknown(wc, p2) |
|
389 | checkunknown(wc, p2) | |
398 | if not branchmerge: |
|
390 | if not branchmerge: | |
399 | action += forgetremoved(wc, p2) |
|
391 | action += forgetremoved(wc, p2) | |
400 |
|
||||
401 | action += manifestmerge(repo, wc, p2, pa, overwrite, partial) |
|
392 | action += manifestmerge(repo, wc, p2, pa, overwrite, partial) | |
402 |
|
393 | |||
403 | ### apply phase |
|
394 | ### apply phase | |
404 |
|
395 | if not branchmerge: # just jump to the new rev | ||
405 | if not branchmerge: |
|
396 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | |
406 | # just jump to the new rev |
|
|||
407 | fp1, fp2, xp1, xp2 = p2.node(), nullid, str(p2), '' |
|
|||
408 | else: |
|
|||
409 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
|
|||
410 |
|
||||
411 | if not partial: |
|
397 | if not partial: | |
412 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
398 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | |
413 |
|
399 | |||
414 | updated, merged, removed, unresolved = applyupdates(repo, action, wc, p2) |
|
400 | updated, merged, removed, unresolved = applyupdates(repo, action, wc, p2) | |
415 |
|
401 | |||
416 | # update dirstate |
|
|||
417 | if not partial: |
|
|||
418 | recordupdates(repo, action, branchmerge, p2) |
|
|||
419 | repo.dirstate.setparents(fp1, fp2) |
|
|||
420 | repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved) |
|
|||
421 |
|
||||
422 | if show_stats: |
|
402 | if show_stats: | |
423 | stats = ((updated, _("updated")), |
|
403 | stats = ((updated, _("updated")), | |
424 | (merged - unresolved, _("merged")), |
|
404 | (merged - unresolved, _("merged")), | |
@@ -427,6 +407,10 b' def update(repo, node, branchmerge=False' | |||||
427 | note = ", ".join([_("%d files %s") % s for s in stats]) |
|
407 | note = ", ".join([_("%d files %s") % s for s in stats]) | |
428 | repo.ui.status("%s\n" % note) |
|
408 | repo.ui.status("%s\n" % note) | |
429 | if not partial: |
|
409 | if not partial: | |
|
410 | recordupdates(repo, action, branchmerge, p2) | |||
|
411 | repo.dirstate.setparents(fp1, fp2) | |||
|
412 | repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved) | |||
|
413 | ||||
430 | if branchmerge: |
|
414 | if branchmerge: | |
431 | if unresolved: |
|
415 | if unresolved: | |
432 | repo.ui.status(_("There are unresolved merges," |
|
416 | repo.ui.status(_("There are unresolved merges," |
@@ -22,11 +22,11 b' added 1 changesets with 1 changes to 1 f' | |||||
22 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
22 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
23 | merge: warning: conflicts during merge |
|
23 | merge: warning: conflicts during merge | |
24 | resolving manifests |
|
24 | resolving manifests | |
25 |
overwrite None |
|
25 | overwrite None partial False | |
26 |
ancestor 451c744aabcc |
|
26 | ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 | |
27 | test.txt: versions differ -> m |
|
27 | test.txt: versions differ -> m | |
28 | merging test.txt |
|
28 | merging test.txt | |
29 |
my test.txt@ |
|
29 | my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 | |
30 | merging test.txt failed! |
|
30 | merging test.txt failed! | |
31 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
31 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
32 | There are unresolved merges, you can redo the full merge using: |
|
32 | There are unresolved merges, you can redo the full merge using: |
@@ -2,12 +2,12 b' checkout' | |||||
2 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
3 | merge |
|
3 | merge | |
4 | resolving manifests |
|
4 | resolving manifests | |
5 |
overwrite None |
|
5 | overwrite None partial False | |
6 |
ancestor f26ec4fc3fa3 |
|
6 | ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 | |
7 | a: remote moved -> m |
|
7 | a: remote moved -> m | |
8 | b2: remote created -> g |
|
8 | b2: remote created -> g | |
9 | merging a and b |
|
9 | merging a and b | |
10 |
my a@ |
|
10 | my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c | |
11 | copying a to b |
|
11 | copying a to b | |
12 | removing a |
|
12 | removing a | |
13 | getting b2 |
|
13 | getting b2 |
@@ -2,15 +2,15 b'' | |||||
2 | test L:up a R:nc a b W: - 1 get local a to b |
|
2 | test L:up a R:nc a b W: - 1 get local a to b | |
3 | -------------- |
|
3 | -------------- | |
4 | resolving manifests |
|
4 | resolving manifests | |
5 |
overwrite None |
|
5 | overwrite None partial False | |
6 |
ancestor e300d1c794ec |
|
6 | ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | |
7 | rev: versions differ -> m |
|
7 | rev: versions differ -> m | |
8 | a: remote copied -> m |
|
8 | a: remote copied -> m | |
9 | merging a and b |
|
9 | merging a and b | |
10 |
my a@ |
|
10 | my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 | |
11 | copying a to b |
|
11 | copying a to b | |
12 | merging rev |
|
12 | merging rev | |
13 |
my rev@ |
|
13 | my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 | |
14 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
14 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
15 | (branch merge, don't forget to commit) |
|
15 | (branch merge, don't forget to commit) | |
16 | -------------- |
|
16 | -------------- | |
@@ -23,16 +23,16 b' M b' | |||||
23 | test L:nc a b R:up a W: - 2 get rem change to a and b |
|
23 | test L:nc a b R:up a W: - 2 get rem change to a and b | |
24 | -------------- |
|
24 | -------------- | |
25 | resolving manifests |
|
25 | resolving manifests | |
26 |
overwrite None |
|
26 | overwrite None partial False | |
27 |
ancestor ac809aeed39a |
|
27 | ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
28 | a: remote is newer -> g |
|
28 | a: remote is newer -> g | |
29 | b: local copied -> m |
|
29 | b: local copied -> m | |
30 | rev: versions differ -> m |
|
30 | rev: versions differ -> m | |
31 | getting a |
|
31 | getting a | |
32 | merging b and a |
|
32 | merging b and a | |
33 |
my b@ |
|
33 | my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 | |
34 | merging rev |
|
34 | merging rev | |
35 |
my rev@ |
|
35 | my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
36 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
36 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
37 | (branch merge, don't forget to commit) |
|
37 | (branch merge, don't forget to commit) | |
38 | -------------- |
|
38 | -------------- | |
@@ -45,16 +45,16 b' M b' | |||||
45 | test L:up a R:nm a b W: - 3 get local a change to b, remove a |
|
45 | test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
46 | -------------- |
|
46 | -------------- | |
47 | resolving manifests |
|
47 | resolving manifests | |
48 |
overwrite None |
|
48 | overwrite None partial False | |
49 |
ancestor e300d1c794ec |
|
49 | ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
50 | a: remote moved -> m |
|
50 | a: remote moved -> m | |
51 | rev: versions differ -> m |
|
51 | rev: versions differ -> m | |
52 | merging a and b |
|
52 | merging a and b | |
53 |
my a@ |
|
53 | my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 | |
54 | copying a to b |
|
54 | copying a to b | |
55 | removing a |
|
55 | removing a | |
56 | merging rev |
|
56 | merging rev | |
57 |
my rev@ |
|
57 | my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 | |
58 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
58 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
59 | (branch merge, don't forget to commit) |
|
59 | (branch merge, don't forget to commit) | |
60 | -------------- |
|
60 | -------------- | |
@@ -66,14 +66,14 b' M b' | |||||
66 | test L:nm a b R:up a W: - 4 get remote change to b |
|
66 | test L:nm a b R:up a W: - 4 get remote change to b | |
67 | -------------- |
|
67 | -------------- | |
68 | resolving manifests |
|
68 | resolving manifests | |
69 |
overwrite None |
|
69 | overwrite None partial False | |
70 |
ancestor ecf3cb2a4219 |
|
70 | ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
71 | b: local moved -> m |
|
71 | b: local moved -> m | |
72 | rev: versions differ -> m |
|
72 | rev: versions differ -> m | |
73 | merging b and a |
|
73 | merging b and a | |
74 |
my b@ |
|
74 | my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 | |
75 | merging rev |
|
75 | merging rev | |
76 |
my rev@ |
|
76 | my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
77 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
77 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
78 | (branch merge, don't forget to commit) |
|
78 | (branch merge, don't forget to commit) | |
79 | -------------- |
|
79 | -------------- | |
@@ -85,13 +85,13 b' M b' | |||||
85 | test L: R:nc a b W: - 5 get b |
|
85 | test L: R:nc a b W: - 5 get b | |
86 | -------------- |
|
86 | -------------- | |
87 | resolving manifests |
|
87 | resolving manifests | |
88 |
overwrite None |
|
88 | overwrite None partial False | |
89 |
ancestor 94b33a1b7f2d |
|
89 | ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
90 | rev: versions differ -> m |
|
90 | rev: versions differ -> m | |
91 | a: remote copied -> m |
|
91 | a: remote copied -> m | |
92 | copying a to b |
|
92 | copying a to b | |
93 | merging rev |
|
93 | merging rev | |
94 |
my rev@ |
|
94 | my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 | |
95 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
95 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
96 | (branch merge, don't forget to commit) |
|
96 | (branch merge, don't forget to commit) | |
97 | -------------- |
|
97 | -------------- | |
@@ -104,12 +104,12 b' C a' | |||||
104 | test L:nc a b R: W: - 6 nothing |
|
104 | test L:nc a b R: W: - 6 nothing | |
105 | -------------- |
|
105 | -------------- | |
106 | resolving manifests |
|
106 | resolving manifests | |
107 |
overwrite None |
|
107 | overwrite None partial False | |
108 |
ancestor |
|
108 | ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
109 | b: local copied -> m |
|
109 | b: local copied -> m | |
110 | rev: versions differ -> m |
|
110 | rev: versions differ -> m | |
111 | merging rev |
|
111 | merging rev | |
112 |
my rev@ |
|
112 | my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 | |
113 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
113 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
114 | (branch merge, don't forget to commit) |
|
114 | (branch merge, don't forget to commit) | |
115 | -------------- |
|
115 | -------------- | |
@@ -122,14 +122,14 b' C a' | |||||
122 | test L: R:nm a b W: - 7 get b |
|
122 | test L: R:nm a b W: - 7 get b | |
123 | -------------- |
|
123 | -------------- | |
124 | resolving manifests |
|
124 | resolving manifests | |
125 |
overwrite None |
|
125 | overwrite None partial False | |
126 |
ancestor 94b33a1b7f2d |
|
126 | ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
127 | a: remote moved -> m |
|
127 | a: remote moved -> m | |
128 | rev: versions differ -> m |
|
128 | rev: versions differ -> m | |
129 | copying a to b |
|
129 | copying a to b | |
130 | removing a |
|
130 | removing a | |
131 | merging rev |
|
131 | merging rev | |
132 |
my rev@ |
|
132 | my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 | |
133 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
133 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
134 | (branch merge, don't forget to commit) |
|
134 | (branch merge, don't forget to commit) | |
135 | -------------- |
|
135 | -------------- | |
@@ -141,12 +141,12 b' M b' | |||||
141 | test L:nm a b R: W: - 8 nothing |
|
141 | test L:nm a b R: W: - 8 nothing | |
142 | -------------- |
|
142 | -------------- | |
143 | resolving manifests |
|
143 | resolving manifests | |
144 |
overwrite None |
|
144 | overwrite None partial False | |
145 |
ancestor ecf3cb2a4219 |
|
145 | ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
146 | b: local moved -> m |
|
146 | b: local moved -> m | |
147 | rev: versions differ -> m |
|
147 | rev: versions differ -> m | |
148 | merging rev |
|
148 | merging rev | |
149 |
my rev@ |
|
149 | my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 | |
150 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
150 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
151 | (branch merge, don't forget to commit) |
|
151 | (branch merge, don't forget to commit) | |
152 | -------------- |
|
152 | -------------- | |
@@ -158,14 +158,14 b' M b' | |||||
158 | test L:um a b R:um a b W: - 9 do merge with ancestor in a |
|
158 | test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
159 | -------------- |
|
159 | -------------- | |
160 | resolving manifests |
|
160 | resolving manifests | |
161 |
overwrite None |
|
161 | overwrite None partial False | |
162 |
ancestor ec03c2ca8642 |
|
162 | ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
163 | b: versions differ -> m |
|
163 | b: versions differ -> m | |
164 | rev: versions differ -> m |
|
164 | rev: versions differ -> m | |
165 | merging b |
|
165 | merging b | |
166 |
my b@ |
|
166 | my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 | |
167 | merging rev |
|
167 | merging rev | |
168 |
my rev@ |
|
168 | my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | |
169 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
169 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
170 | (branch merge, don't forget to commit) |
|
170 | (branch merge, don't forget to commit) | |
171 | -------------- |
|
171 | -------------- | |
@@ -176,13 +176,13 b' M b' | |||||
176 | test L:nm a b R:nm a c W: - 11 get c, keep b |
|
176 | test L:nm a b R:nm a c W: - 11 get c, keep b | |
177 | -------------- |
|
177 | -------------- | |
178 | resolving manifests |
|
178 | resolving manifests | |
179 |
overwrite None |
|
179 | overwrite None partial False | |
180 |
ancestor ecf3cb2a4219 |
|
180 | ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
181 | rev: versions differ -> m |
|
181 | rev: versions differ -> m | |
182 | c: remote created -> g |
|
182 | c: remote created -> g | |
183 | getting c |
|
183 | getting c | |
184 | merging rev |
|
184 | merging rev | |
185 |
my rev@ |
|
185 | my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 | |
186 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
186 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
187 | (branch merge, don't forget to commit) |
|
187 | (branch merge, don't forget to commit) | |
188 | -------------- |
|
188 | -------------- | |
@@ -194,14 +194,14 b' C b' | |||||
194 | test L:nc a b R:up b W: - 12 merge b no ancestor |
|
194 | test L:nc a b R:up b W: - 12 merge b no ancestor | |
195 | -------------- |
|
195 | -------------- | |
196 | resolving manifests |
|
196 | resolving manifests | |
197 |
overwrite None |
|
197 | overwrite None partial False | |
198 |
ancestor ac809aeed39a |
|
198 | ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
199 | b: versions differ -> m |
|
199 | b: versions differ -> m | |
200 | rev: versions differ -> m |
|
200 | rev: versions differ -> m | |
201 | merging b |
|
201 | merging b | |
202 |
my b@ |
|
202 | my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 | |
203 | merging rev |
|
203 | merging rev | |
204 |
my rev@ |
|
204 | my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
205 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
205 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
206 | (branch merge, don't forget to commit) |
|
206 | (branch merge, don't forget to commit) | |
207 | -------------- |
|
207 | -------------- | |
@@ -213,16 +213,16 b' C a' | |||||
213 | test L:up b R:nm a b W: - 13 merge b no ancestor |
|
213 | test L:up b R:nm a b W: - 13 merge b no ancestor | |
214 | -------------- |
|
214 | -------------- | |
215 | resolving manifests |
|
215 | resolving manifests | |
216 |
overwrite None |
|
216 | overwrite None partial False | |
217 |
ancestor 59318016310c |
|
217 | ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
218 | a: other deleted -> r |
|
218 | a: other deleted -> r | |
219 | b: versions differ -> m |
|
219 | b: versions differ -> m | |
220 | rev: versions differ -> m |
|
220 | rev: versions differ -> m | |
221 | removing a |
|
221 | removing a | |
222 | merging b |
|
222 | merging b | |
223 |
my b@ |
|
223 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | |
224 | merging rev |
|
224 | merging rev | |
225 |
my rev@ |
|
225 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | |
226 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
226 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
227 | (branch merge, don't forget to commit) |
|
227 | (branch merge, don't forget to commit) | |
228 | -------------- |
|
228 | -------------- | |
@@ -233,16 +233,16 b' M b' | |||||
233 | test L:nc a b R:up a b W: - 14 merge b no ancestor |
|
233 | test L:nc a b R:up a b W: - 14 merge b no ancestor | |
234 | -------------- |
|
234 | -------------- | |
235 | resolving manifests |
|
235 | resolving manifests | |
236 |
overwrite None |
|
236 | overwrite None partial False | |
237 |
ancestor ac809aeed39a |
|
237 | ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
238 | a: remote is newer -> g |
|
238 | a: remote is newer -> g | |
239 | b: versions differ -> m |
|
239 | b: versions differ -> m | |
240 | rev: versions differ -> m |
|
240 | rev: versions differ -> m | |
241 | getting a |
|
241 | getting a | |
242 | merging b |
|
242 | merging b | |
243 |
my b@ |
|
243 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | |
244 | merging rev |
|
244 | merging rev | |
245 |
my rev@ |
|
245 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | |
246 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
246 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
247 | (branch merge, don't forget to commit) |
|
247 | (branch merge, don't forget to commit) | |
248 | -------------- |
|
248 | -------------- | |
@@ -254,16 +254,16 b' M b' | |||||
254 | test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
|
254 | test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
255 | -------------- |
|
255 | -------------- | |
256 | resolving manifests |
|
256 | resolving manifests | |
257 |
overwrite None |
|
257 | overwrite None partial False | |
258 |
ancestor 59318016310c |
|
258 | ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
259 | a: other deleted -> r |
|
259 | a: other deleted -> r | |
260 | b: versions differ -> m |
|
260 | b: versions differ -> m | |
261 | rev: versions differ -> m |
|
261 | rev: versions differ -> m | |
262 | removing a |
|
262 | removing a | |
263 | merging b |
|
263 | merging b | |
264 |
my b@ |
|
264 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | |
265 | merging rev |
|
265 | merging rev | |
266 |
my rev@ |
|
266 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | |
267 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
267 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
268 | (branch merge, don't forget to commit) |
|
268 | (branch merge, don't forget to commit) | |
269 | -------------- |
|
269 | -------------- | |
@@ -274,16 +274,16 b' M b' | |||||
274 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
|
274 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor | |
275 | -------------- |
|
275 | -------------- | |
276 | resolving manifests |
|
276 | resolving manifests | |
277 |
overwrite None |
|
277 | overwrite None partial False | |
278 |
ancestor ac809aeed39a |
|
278 | ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
279 | a: remote is newer -> g |
|
279 | a: remote is newer -> g | |
280 | b: versions differ -> m |
|
280 | b: versions differ -> m | |
281 | rev: versions differ -> m |
|
281 | rev: versions differ -> m | |
282 | getting a |
|
282 | getting a | |
283 | merging b |
|
283 | merging b | |
284 |
my b@ |
|
284 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | |
285 | merging rev |
|
285 | merging rev | |
286 |
my rev@ |
|
286 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | |
287 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
287 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
288 | (branch merge, don't forget to commit) |
|
288 | (branch merge, don't forget to commit) | |
289 | -------------- |
|
289 | -------------- | |
@@ -295,14 +295,14 b' M b' | |||||
295 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
|
295 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor | |
296 | -------------- |
|
296 | -------------- | |
297 | resolving manifests |
|
297 | resolving manifests | |
298 |
overwrite None |
|
298 | overwrite None partial False | |
299 |
ancestor 0b76e65c8289 |
|
299 | ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
300 | b: versions differ -> m |
|
300 | b: versions differ -> m | |
301 | rev: versions differ -> m |
|
301 | rev: versions differ -> m | |
302 | merging b |
|
302 | merging b | |
303 |
my b@ |
|
303 | my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 | |
304 | merging rev |
|
304 | merging rev | |
305 |
my rev@ |
|
305 | my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 | |
306 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
306 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
307 | (branch merge, don't forget to commit) |
|
307 | (branch merge, don't forget to commit) | |
308 | -------------- |
|
308 | -------------- | |
@@ -314,16 +314,16 b' C a' | |||||
314 | test L:nm a b R:up a b W: - 18 merge b no ancestor |
|
314 | test L:nm a b R:up a b W: - 18 merge b no ancestor | |
315 | -------------- |
|
315 | -------------- | |
316 | resolving manifests |
|
316 | resolving manifests | |
317 |
overwrite None |
|
317 | overwrite None partial False | |
318 |
ancestor ecf3cb2a4219 |
|
318 | ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
319 | b: versions differ -> m |
|
319 | b: versions differ -> m | |
320 | rev: versions differ -> m |
|
320 | rev: versions differ -> m | |
321 | a: prompt recreating -> g |
|
321 | a: prompt recreating -> g | |
322 | getting a |
|
322 | getting a | |
323 | merging b |
|
323 | merging b | |
324 |
my b@ |
|
324 | my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 | |
325 | merging rev |
|
325 | merging rev | |
326 |
my rev@ |
|
326 | my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 | |
327 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
327 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
328 | (branch merge, don't forget to commit) |
|
328 | (branch merge, don't forget to commit) | |
329 | -------------- |
|
329 | -------------- | |
@@ -335,14 +335,14 b' M b' | |||||
335 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
|
335 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a | |
336 | -------------- |
|
336 | -------------- | |
337 | resolving manifests |
|
337 | resolving manifests | |
338 |
overwrite None |
|
338 | overwrite None partial False | |
339 |
ancestor 0b76e65c8289 |
|
339 | ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
340 | b: versions differ -> m |
|
340 | b: versions differ -> m | |
341 | rev: versions differ -> m |
|
341 | rev: versions differ -> m | |
342 | merging b |
|
342 | merging b | |
343 |
my b@ |
|
343 | my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 | |
344 | merging rev |
|
344 | merging rev | |
345 |
my rev@ |
|
345 | my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 | |
346 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
346 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
347 | (branch merge, don't forget to commit) |
|
347 | (branch merge, don't forget to commit) | |
348 | -------------- |
|
348 | -------------- | |
@@ -354,16 +354,16 b' C a' | |||||
354 | test L:up a R:um a b W: - 20 merge a and b to b, remove a |
|
354 | test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
355 | -------------- |
|
355 | -------------- | |
356 | resolving manifests |
|
356 | resolving manifests | |
357 |
overwrite None |
|
357 | overwrite None partial False | |
358 |
ancestor e300d1c794ec |
|
358 | ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
359 | a: remote moved -> m |
|
359 | a: remote moved -> m | |
360 | rev: versions differ -> m |
|
360 | rev: versions differ -> m | |
361 | merging a and b |
|
361 | merging a and b | |
362 |
my a@ |
|
362 | my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 | |
363 | copying a to b |
|
363 | copying a to b | |
364 | removing a |
|
364 | removing a | |
365 | merging rev |
|
365 | merging rev | |
366 |
my rev@ |
|
366 | my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | |
367 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
367 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
368 | (branch merge, don't forget to commit) |
|
368 | (branch merge, don't forget to commit) | |
369 | -------------- |
|
369 | -------------- | |
@@ -375,14 +375,14 b' M b' | |||||
375 | test L:um a b R:up a W: - 21 merge a and b to b |
|
375 | test L:um a b R:up a W: - 21 merge a and b to b | |
376 | -------------- |
|
376 | -------------- | |
377 | resolving manifests |
|
377 | resolving manifests | |
378 |
overwrite None |
|
378 | overwrite None partial False | |
379 |
ancestor ec03c2ca8642 |
|
379 | ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
380 | b: local moved -> m |
|
380 | b: local moved -> m | |
381 | rev: versions differ -> m |
|
381 | rev: versions differ -> m | |
382 | merging b and a |
|
382 | merging b and a | |
383 |
my b@ |
|
383 | my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 | |
384 | merging rev |
|
384 | merging rev | |
385 |
my rev@ |
|
385 | my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
386 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
386 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
387 | (branch merge, don't forget to commit) |
|
387 | (branch merge, don't forget to commit) | |
388 | -------------- |
|
388 | -------------- | |
@@ -394,16 +394,16 b' M b' | |||||
394 | test L:nm a b R:up a c W: - 23 get c, keep b |
|
394 | test L:nm a b R:up a c W: - 23 get c, keep b | |
395 | -------------- |
|
395 | -------------- | |
396 | resolving manifests |
|
396 | resolving manifests | |
397 |
overwrite None |
|
397 | overwrite None partial False | |
398 |
ancestor ecf3cb2a4219 |
|
398 | ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
399 | b: local moved -> m |
|
399 | b: local moved -> m | |
400 | rev: versions differ -> m |
|
400 | rev: versions differ -> m | |
401 | c: remote created -> g |
|
401 | c: remote created -> g | |
402 | merging b and a |
|
402 | merging b and a | |
403 |
my b@ |
|
403 | my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 | |
404 | getting c |
|
404 | getting c | |
405 | merging rev |
|
405 | merging rev | |
406 |
my rev@ |
|
406 | my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 | |
407 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
407 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
408 | (branch merge, don't forget to commit) |
|
408 | (branch merge, don't forget to commit) | |
409 | -------------- |
|
409 | -------------- |
@@ -15,12 +15,12 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
15 | summary: 1 |
|
15 | summary: 1 | |
16 |
|
16 | |||
17 | resolving manifests |
|
17 | resolving manifests | |
18 |
overwrite False |
|
18 | overwrite False partial False | |
19 |
ancestor 33aaa84a386b local 802f095af299 |
|
19 | ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 | |
20 | a: versions differ -> m |
|
20 | a: versions differ -> m | |
21 | b: remote created -> g |
|
21 | b: remote created -> g | |
22 | merging a |
|
22 | merging a | |
23 |
my a@ |
|
23 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b | |
24 | getting b |
|
24 | getting b | |
25 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
25 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
26 | changeset: 1:802f095af299 |
|
26 | changeset: 1:802f095af299 | |
@@ -30,8 +30,8 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
30 | summary: 2 |
|
30 | summary: 2 | |
31 |
|
31 | |||
32 | resolving manifests |
|
32 | resolving manifests | |
33 |
overwrite False |
|
33 | overwrite False partial False | |
34 |
ancestor 802f095af299 |
|
34 | ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b | |
35 | b: remote deleted -> r |
|
35 | b: remote deleted -> r | |
36 | removing b |
|
36 | removing b | |
37 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
37 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -48,12 +48,12 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
48 | summary: 1 |
|
48 | summary: 1 | |
49 |
|
49 | |||
50 | resolving manifests |
|
50 | resolving manifests | |
51 |
overwrite False |
|
51 | overwrite False partial False | |
52 |
ancestor 33aaa84a386b local 802f095af299 |
|
52 | ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 | |
53 | a: versions differ -> m |
|
53 | a: versions differ -> m | |
54 | b: remote created -> g |
|
54 | b: remote created -> g | |
55 | merging a |
|
55 | merging a | |
56 |
my a@ |
|
56 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b | |
57 | getting b |
|
57 | getting b | |
58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
59 | changeset: 1:802f095af299 |
|
59 | changeset: 1:802f095af299 | |
@@ -98,14 +98,14 b' failed' | |||||
98 | abort: outstanding uncommitted changes |
|
98 | abort: outstanding uncommitted changes | |
99 | failed |
|
99 | failed | |
100 | resolving manifests |
|
100 | resolving manifests | |
101 |
overwrite False |
|
101 | overwrite False partial False | |
102 |
ancestor 802f095af299 |
|
102 | ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d | |
103 | a: versions differ -> m |
|
103 | a: versions differ -> m | |
104 | b: versions differ -> m |
|
104 | b: versions differ -> m | |
105 | merging a |
|
105 | merging a | |
106 |
my a@ |
|
106 | my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b | |
107 | merging b |
|
107 | merging b | |
108 |
my b@ |
|
108 | my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 | |
109 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
109 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
110 | (branch merge, don't forget to commit) |
|
110 | (branch merge, don't forget to commit) | |
111 | changeset: 1:802f095af299 |
|
111 | changeset: 1:802f095af299 |
@@ -40,8 +40,8 b' a' | |||||
40 | side1 |
|
40 | side1 | |
41 | side2 |
|
41 | side2 | |
42 | resolving manifests |
|
42 | resolving manifests | |
43 |
overwrite True |
|
43 | overwrite True partial False | |
44 |
ancestor ded32b0db104 |
|
44 | ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8 | |
45 | side2: remote deleted -> r |
|
45 | side2: remote deleted -> r | |
46 | side1: remote deleted -> r |
|
46 | side1: remote deleted -> r | |
47 | main: remote created -> g |
|
47 | main: remote created -> g |
General Comments 0
You need to be logged in to leave comments.
Login now