Show More
@@ -0,0 +1,33 b'' | |||
|
1 | #!/bin/sh | |
|
2 | ||
|
3 | # Test issue 746: renaming files brought by the | |
|
4 | # second parent of a merge was broken. | |
|
5 | ||
|
6 | echo % create source repository | |
|
7 | hg init t | |
|
8 | cd t | |
|
9 | echo a > a | |
|
10 | hg ci -Am a | |
|
11 | cd .. | |
|
12 | ||
|
13 | echo % fork source repository | |
|
14 | hg clone t t2 | |
|
15 | cd t2 | |
|
16 | echo b > b | |
|
17 | hg ci -Am b | |
|
18 | ||
|
19 | echo % update source repository | |
|
20 | cd ../t | |
|
21 | echo a >> a | |
|
22 | hg ci -m a2 | |
|
23 | ||
|
24 | echo % merge repositories | |
|
25 | hg pull ../t2 | |
|
26 | hg merge | |
|
27 | ||
|
28 | echo % rename b as c | |
|
29 | hg mv b c | |
|
30 | hg st | |
|
31 | echo % rename back c as b | |
|
32 | hg mv c b | |
|
33 | hg st |
@@ -0,0 +1,20 b'' | |||
|
1 | % create source repository | |
|
2 | adding a | |
|
3 | % fork source repository | |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
5 | adding b | |
|
6 | % update source repository | |
|
7 | % merge repositories | |
|
8 | pulling from ../t2 | |
|
9 | searching for changes | |
|
10 | adding changesets | |
|
11 | adding manifests | |
|
12 | adding file changes | |
|
13 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
14 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
16 | (branch merge, don't forget to commit) | |
|
17 | % rename b as c | |
|
18 | A c | |
|
19 | R b | |
|
20 | % rename back c as b |
General Comments 0
You need to be logged in to leave comments.
Login now