Show More
@@ -1273,16 +1273,6 b' def update(repo, node, branchmerge, forc' | |||||
1273 | actions['g'].append((f, (flags,), "prompt recreating")) |
|
1273 | actions['g'].append((f, (flags,), "prompt recreating")) | |
1274 | del actions['dc'][:] |
|
1274 | del actions['dc'][:] | |
1275 |
|
1275 | |||
1276 | ### apply phase |
|
|||
1277 | if not branchmerge: # just jump to the new rev |
|
|||
1278 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
|
|||
1279 | if not partial: |
|
|||
1280 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
|||
1281 | # note that we're in the middle of an update |
|
|||
1282 | repo.vfs.write('updatestate', p2.hex()) |
|
|||
1283 |
|
||||
1284 | stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
|
|||
1285 |
|
||||
1286 | # divergent renames |
|
1276 | # divergent renames | |
1287 | for f, fl in sorted(diverge.iteritems()): |
|
1277 | for f, fl in sorted(diverge.iteritems()): | |
1288 | repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
1278 | repo.ui.warn(_("note: possible conflict - %s was renamed " | |
@@ -1297,6 +1287,16 b' def update(repo, node, branchmerge, forc' | |||||
1297 | for nf in fl: |
|
1287 | for nf in fl: | |
1298 | repo.ui.warn(" %s\n" % nf) |
|
1288 | repo.ui.warn(" %s\n" % nf) | |
1299 |
|
1289 | |||
|
1290 | ### apply phase | |||
|
1291 | if not branchmerge: # just jump to the new rev | |||
|
1292 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | |||
|
1293 | if not partial: | |||
|
1294 | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | |||
|
1295 | # note that we're in the middle of an update | |||
|
1296 | repo.vfs.write('updatestate', p2.hex()) | |||
|
1297 | ||||
|
1298 | stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) | |||
|
1299 | ||||
1300 | if not partial: |
|
1300 | if not partial: | |
1301 | repo.dirstate.beginparentchange() |
|
1301 | repo.dirstate.beginparentchange() | |
1302 | repo.setparents(fp1, fp2) |
|
1302 | repo.setparents(fp1, fp2) |
@@ -36,6 +36,9 b'' | |||||
36 | resolving manifests |
|
36 | resolving manifests | |
37 | branchmerge: True, force: False, partial: False |
|
37 | branchmerge: True, force: False, partial: False | |
38 | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
|
38 | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | |
|
39 | note: possible conflict - a2 was renamed multiple times to: | |||
|
40 | c2 | |||
|
41 | b2 | |||
39 | preserving a for resolve of b |
|
42 | preserving a for resolve of b | |
40 | removing a |
|
43 | removing a | |
41 | b2: remote created -> g |
|
44 | b2: remote created -> g | |
@@ -45,9 +48,6 b'' | |||||
45 | merging a and b to b |
|
48 | merging a and b to b | |
46 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
|
49 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | |
47 | premerge successful |
|
50 | premerge successful | |
48 | note: possible conflict - a2 was renamed multiple times to: |
|
|||
49 | c2 |
|
|||
50 | b2 |
|
|||
51 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
51 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
52 | (branch merge, don't forget to commit) |
|
52 | (branch merge, don't forget to commit) | |
53 |
|
53 | |||
@@ -177,10 +177,10 b' Check for issue3074' | |||||
177 | resolving manifests |
|
177 | resolving manifests | |
178 | branchmerge: True, force: False, partial: False |
|
178 | branchmerge: True, force: False, partial: False | |
179 | ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
|
179 | ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 | |
|
180 | note: possible conflict - file was deleted and renamed to: | |||
|
181 | newfile | |||
180 | newfile: remote created -> g |
|
182 | newfile: remote created -> g | |
181 | getting newfile |
|
183 | getting newfile | |
182 | note: possible conflict - file was deleted and renamed to: |
|
|||
183 | newfile |
|
|||
184 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
184 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
185 | (branch merge, don't forget to commit) |
|
185 | (branch merge, don't forget to commit) | |
186 | $ hg status |
|
186 | $ hg status |
@@ -411,6 +411,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
411 | resolving manifests |
|
411 | resolving manifests | |
412 | branchmerge: True, force: False, partial: False |
|
412 | branchmerge: True, force: False, partial: False | |
413 | ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
|
413 | ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e | |
|
414 | note: possible conflict - a was renamed multiple times to: | |||
|
415 | b | |||
|
416 | c | |||
414 | preserving rev for resolve of rev |
|
417 | preserving rev for resolve of rev | |
415 | c: remote created -> g |
|
418 | c: remote created -> g | |
416 | getting c |
|
419 | getting c | |
@@ -423,9 +426,6 b' m "um a c" "um x c" " " "10 do merg' | |||||
423 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
426 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
424 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
|
427 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
425 | merge tool returned: 0 |
|
428 | merge tool returned: 0 | |
426 | note: possible conflict - a was renamed multiple times to: |
|
|||
427 | b |
|
|||
428 | c |
|
|||
429 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
429 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
430 | (branch merge, don't forget to commit) |
|
430 | (branch merge, don't forget to commit) | |
431 | -------------- |
|
431 | -------------- |
General Comments 0
You need to be logged in to leave comments.
Login now