Show More
@@ -0,0 +1,33 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb | |||
|
4 | # (merge correctly when all the files in a directory are moved | |||
|
5 | # but then local changes are added in the same directory) | |||
|
6 | ||||
|
7 | hg init a | |||
|
8 | cd a | |||
|
9 | mkdir -p testdir | |||
|
10 | echo a > testdir/a | |||
|
11 | hg add testdir/a | |||
|
12 | hg commit -u test -d '1000000 0' -m a | |||
|
13 | cd .. | |||
|
14 | ||||
|
15 | hg clone a b | |||
|
16 | cd a | |||
|
17 | echo alpha > testdir/a | |||
|
18 | hg commit -u test -d '1000000 0' -m remote-change | |||
|
19 | cd .. | |||
|
20 | ||||
|
21 | cd b | |||
|
22 | mkdir testdir/subdir | |||
|
23 | hg mv testdir/a testdir/subdir/a | |||
|
24 | hg commit -u test -d '1000000 0' -m move | |||
|
25 | mkdir newdir | |||
|
26 | echo beta > newdir/beta | |||
|
27 | hg add newdir/beta | |||
|
28 | hg commit -u test -d '1000000 0' -m local-addition | |||
|
29 | hg pull ../a | |||
|
30 | hg up -C 2 | |||
|
31 | hg merge | |||
|
32 | hg stat | |||
|
33 | hg diff --nodates |
@@ -0,0 +1,19 b'' | |||||
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
2 | pulling from ../a | |||
|
3 | searching for changes | |||
|
4 | adding changesets | |||
|
5 | adding manifests | |||
|
6 | adding file changes | |||
|
7 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
8 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
10 | merging testdir/subdir/a and testdir/a | |||
|
11 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
12 | (branch merge, don't forget to commit) | |||
|
13 | M testdir/subdir/a | |||
|
14 | diff -r d02b3fc32762 testdir/subdir/a | |||
|
15 | --- a/testdir/subdir/a | |||
|
16 | +++ b/testdir/subdir/a | |||
|
17 | @@ -1,1 +1,1 @@ a | |||
|
18 | -a | |||
|
19 | +alpha |
General Comments 0
You need to be logged in to leave comments.
Login now