Mercurial > hg
comparison tests/test-merge9 @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | |
children | 92ccccb55ba3 |
comparison
equal
deleted
inserted
replaced
4680:059bdc8dfb9d | 4682:dc5920ea12f8 |
---|---|
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 |