Show More
@@ -0,0 +1,81 b'' | |||||
|
1 | $ hg init repo | |||
|
2 | $ cd repo | |||
|
3 | $ echo base > base | |||
|
4 | $ hg add base | |||
|
5 | $ hg commit -m "base" | |||
|
6 | $ hg bookmark -i base | |||
|
7 | $ echo 1 > a | |||
|
8 | $ hg add a | |||
|
9 | $ hg commit -m "file" | |||
|
10 | $ hg bookmark -i file | |||
|
11 | $ echo 2 > a | |||
|
12 | $ hg commit -m "file2" | |||
|
13 | $ hg bookmark -i file2 | |||
|
14 | $ hg up -q 0 | |||
|
15 | $ mkdir a | |||
|
16 | $ echo 2 > a/b | |||
|
17 | $ hg add a/b | |||
|
18 | $ hg commit -m "dir" | |||
|
19 | created new head | |||
|
20 | $ hg bookmark -i dir | |||
|
21 | ||||
|
22 | Basic merge - local file conflicts with remote directory | |||
|
23 | ||||
|
24 | $ hg up -q file | |||
|
25 | $ hg bookmark -i | |||
|
26 | $ hg merge --verbose dir | |||
|
27 | resolving manifests | |||
|
28 | getting a/b | |||
|
29 | abort: *: '$TESTTMP/repo/a/b' (glob) | |||
|
30 | [255] | |||
|
31 | $ hg update --clean . | |||
|
32 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
33 | ||||
|
34 | Basic update - local directory conflicts with remote file | |||
|
35 | ||||
|
36 | $ hg up -q 0 | |||
|
37 | $ mkdir a | |||
|
38 | $ echo 3 > a/b | |||
|
39 | $ hg up file | |||
|
40 | abort: *: '$TESTTMP/repo/a' (glob) | |||
|
41 | [255] | |||
|
42 | $ hg up --clean file | |||
|
43 | abort: *: '$TESTTMP/repo/a' (glob) | |||
|
44 | [255] | |||
|
45 | ||||
|
46 | Repo is in a very bad state now - recover manually | |||
|
47 | ||||
|
48 | $ rm -r a | |||
|
49 | $ hg up -q --clean 0 | |||
|
50 | ||||
|
51 | Basic update - untracked file conflicts with remote directory | |||
|
52 | ||||
|
53 | $ hg up -q 0 | |||
|
54 | $ echo untracked > a | |||
|
55 | $ hg up --config merge.checkunknown=warn dir | |||
|
56 | abort: *: '$TESTTMP/repo/a/b' (glob) | |||
|
57 | [255] | |||
|
58 | ||||
|
59 | Repo is in a very bad state now - recover manually | |||
|
60 | ||||
|
61 | $ rm -f a | |||
|
62 | $ hg up -q --clean 0 | |||
|
63 | ||||
|
64 | Basic clean update - local directory conflicts with changed remote file | |||
|
65 | ||||
|
66 | $ hg up -q file | |||
|
67 | $ rm a | |||
|
68 | $ mkdir a | |||
|
69 | $ echo 4 > a/b | |||
|
70 | $ hg up file2 | |||
|
71 | abort: *: '$TESTTMP/repo/a' (glob) | |||
|
72 | [255] | |||
|
73 | $ hg up --clean file2 | |||
|
74 | abort: *: '$TESTTMP/repo/a' (glob) | |||
|
75 | [255] | |||
|
76 | ||||
|
77 | Repo is in a very bad state now - recover manually | |||
|
78 | ||||
|
79 | $ rm -r a | |||
|
80 | $ hg up -q --clean 0 | |||
|
81 |
General Comments 0
You need to be logged in to leave comments.
Login now