Show More
@@ -483,7 +483,8 b' def updaterepo(repo, node, overwrite):' | |||||
483 | When overwrite is set, changes are clobbered, merged else |
|
483 | When overwrite is set, changes are clobbered, merged else | |
484 |
|
484 | |||
485 | returns stats (see pydoc mercurial.merge.applyupdates)""" |
|
485 | returns stats (see pydoc mercurial.merge.applyupdates)""" | |
486 |
return mergemod.update(repo, node, False, overwrite, None |
|
486 | return mergemod.update(repo, node, False, overwrite, None, | |
|
487 | labels=['working copy', 'destination']) | |||
487 |
|
488 | |||
488 | def update(repo, node): |
|
489 | def update(repo, node): | |
489 | """update the working directory to node, merging linear changes""" |
|
490 | """update the working directory to node, merging linear changes""" |
@@ -57,11 +57,11 b'' | |||||
57 | @@ -1,3 +1,7 @@ |
|
57 | @@ -1,3 +1,7 @@ | |
58 | added file1 |
|
58 | added file1 | |
59 | another line of text |
|
59 | another line of text | |
60 |
+<<<<<<< |
|
60 | +<<<<<<< working copy: c3fa057dd86f - test: "added file1 and file2" | |
61 | +changed file1 different |
|
61 | +changed file1 different | |
62 | +======= |
|
62 | +======= | |
63 | changed file1 |
|
63 | changed file1 | |
64 |
+>>>>>>> |
|
64 | +>>>>>>> destination: dfab7f3c2efb - test: "changed file1" | |
65 |
|
65 | |||
66 | $ hg status |
|
66 | $ hg status | |
67 | M file1 |
|
67 | M file1 |
General Comments 0
You need to be logged in to leave comments.
Login now