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