Show More
@@ -1,27 +1,43 b'' | |||||
1 | #!/bin/sh |
|
1 | $ hg init | |
2 |
|
2 | |||
3 | hg init repo |
|
3 | $ echo a > a | |
4 | cd repo |
|
4 | $ hg ci -qAm 'add a' | |
|
5 | ||||
|
6 | $ echo b > b | |||
|
7 | $ hg ci -qAm 'add b' | |||
5 |
|
8 | |||
6 | echo a > a |
|
9 | $ hg up -qC 0 | |
7 | hg ci -qAm 'add a' |
|
10 | $ hg rm a | |
|
11 | $ hg ci -m 'rm a' | |||
|
12 | created new head | |||
8 |
|
13 | |||
9 | echo b > b |
|
14 | $ hg up -qC 1 | |
10 | hg ci -qAm 'add b' |
|
15 | $ rm a | |
|
16 | ||||
|
17 | Local deleted a file, remote removed | |||
|
18 | ||||
|
19 | Should fail, since there are deleted files: | |||
11 |
|
20 | |||
12 | hg up -qC 0 |
|
21 | $ hg merge | |
13 | hg rm a |
|
22 | abort: outstanding uncommitted changes (use 'hg status' to list changes) | |
14 | hg ci -m 'rm a' |
|
23 | ||
|
24 | Should succeed with --force: | |||
15 |
|
25 | |||
16 | hg up -qC 1 |
|
26 | $ hg -v merge --force | |
17 | rm a |
|
27 | resolving manifests | |
|
28 | removing a | |||
|
29 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
30 | (branch merge, don't forget to commit) | |||
18 |
|
31 | |||
19 | echo '% local deleted a file, remote removed' |
|
32 | Should show 'a' as removed: | |
20 | hg merge # should fail, since there are deleted files |
|
33 | ||
21 | hg -v merge --force |
|
34 | $ hg status | |
22 | echo % should show a as removed |
|
35 | R a | |
23 | hg st |
|
|||
24 |
|
36 | |||
25 | hg ci -m merge |
|
37 | $ hg ci -m merge | |
26 | echo % manifest. should not have a: |
|
38 | ||
27 | hg manifest |
|
39 | Should not show 'a': | |
|
40 | ||||
|
41 | $ hg manifest | |||
|
42 | b | |||
|
43 |
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