Show More
@@ -1,19 +1,29 b'' | |||
|
1 | #!/bin/sh | |
|
2 | ||
|
3 | 1 | # test update logic when there are renames |
|
4 | 2 | |
|
5 | ||
|
6 | 3 | # update with local changes across a file rename |
|
7 | hg init a | |
|
8 | cd a | |
|
9 | echo a > a | |
|
10 | hg add a | |
|
11 | hg ci -m a | |
|
12 | hg mv a b | |
|
13 | hg ci -m rename | |
|
14 | echo b > b | |
|
15 |
hg ci -m |
|
|
16 | hg up -q 0 | |
|
17 |
|
|
|
18 | hg up | |
|
19 | cd .. | |
|
4 | ||
|
5 | $ hg init | |
|
6 | ||
|
7 | $ echo a > a | |
|
8 | $ hg add a | |
|
9 | $ hg ci -m a | |
|
10 | ||
|
11 | $ hg mv a b | |
|
12 | $ hg ci -m rename | |
|
13 | ||
|
14 | $ echo b > b | |
|
15 | $ hg ci -m change | |
|
16 | ||
|
17 | $ hg up -q 0 | |
|
18 | ||
|
19 | $ echo c > a | |
|
20 | ||
|
21 | $ hg up | |
|
22 | merging a and b to b | |
|
23 | warning: conflicts during merge. | |
|
24 | merging b failed! | |
|
25 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
26 | use 'hg resolve' to retry unresolved file merges | |
|
27 | ||
|
28 | $ cd .. | |
|
29 |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now