Show More
@@ -0,0 +1,31 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | # test that we don't interrupt the merge session if | |||
|
4 | # a file-level merge failed | |||
|
5 | ||||
|
6 | hg init repo | |||
|
7 | cd repo | |||
|
8 | ||||
|
9 | echo foo > foo | |||
|
10 | echo a > bar | |||
|
11 | hg ci -Am 'add foo' -d '0 0' | |||
|
12 | ||||
|
13 | hg mv foo baz | |||
|
14 | echo b >> bar | |||
|
15 | echo quux > quux1 | |||
|
16 | hg ci -Am 'mv foo baz' -d '0 0' | |||
|
17 | ||||
|
18 | hg up -qC 0 | |||
|
19 | echo >> foo | |||
|
20 | echo c >> bar | |||
|
21 | echo quux > quux2 | |||
|
22 | hg ci -Am 'change foo' -d '0 0' | |||
|
23 | ||||
|
24 | # test with the rename on the remote side | |||
|
25 | HGMERGE=false hg merge | |||
|
26 | ||||
|
27 | # test with the rename on the local side | |||
|
28 | hg up -C 1 | |||
|
29 | HGMERGE=false hg merge | |||
|
30 | ||||
|
31 | true |
@@ -0,0 +1,21 b'' | |||||
|
1 | adding bar | |||
|
2 | adding foo | |||
|
3 | adding quux1 | |||
|
4 | adding quux2 | |||
|
5 | merging bar | |||
|
6 | merging bar failed! | |||
|
7 | merging foo and baz | |||
|
8 | merging foo failed! | |||
|
9 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |||
|
10 | There are unresolved merges, you can redo the full merge using: | |||
|
11 | hg update -C 2 | |||
|
12 | hg merge 1 | |||
|
13 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
14 | merging bar | |||
|
15 | merging bar failed! | |||
|
16 | merging baz and foo | |||
|
17 | merging baz failed! | |||
|
18 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |||
|
19 | There are unresolved merges, you can redo the full merge using: | |||
|
20 | hg update -C 1 | |||
|
21 | hg merge 2 |
@@ -401,12 +401,12 b' def applyupdates(repo, action, wctx, mct' | |||||
401 | updated += 1 |
|
401 | updated += 1 | |
402 | else: |
|
402 | else: | |
403 | merged += 1 |
|
403 | merged += 1 | |
404 |
|
|
404 | if f != fd: | |
405 |
|
|
405 | repo.ui.debug(_("copying %s to %s\n") % (f, fd)) | |
406 |
|
|
406 | repo.wwrite(fd, repo.wread(f), flags) | |
407 |
|
|
407 | if move: | |
408 |
|
|
408 | repo.ui.debug(_("removing %s\n") % f) | |
409 |
|
|
409 | os.unlink(repo.wjoin(f)) | |
410 | util.set_exec(repo.wjoin(fd), "x" in flags) |
|
410 | util.set_exec(repo.wjoin(fd), "x" in flags) | |
411 | elif m == "g": # get |
|
411 | elif m == "g": # get | |
412 | flags = a[2] |
|
412 | flags = a[2] |
General Comments 0
You need to be logged in to leave comments.
Login now