Show More
@@ -1,34 +1,36 b'' | |||||
1 | #!/bin/sh |
|
1 | $ hg init base | |
2 |
|
2 | |||
3 | echo % init foo-base |
|
3 | $ cd base | |
4 | hg init foo-base |
|
4 | $ echo 'alpha' > alpha | |
|
5 | $ hg ci -A -m 'add alpha' | |||
|
6 | adding alpha | |||
|
7 | $ cd .. | |||
5 |
|
8 | |||
6 | echo % create alpha in first repo |
|
9 | $ hg clone base work | |
7 | cd foo-base |
|
10 | updating to branch default | |
8 | echo 'alpha' > alpha |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | hg ci -A -m 'add alpha' -d '1 0' |
|
|||
10 | cd .. |
|
|||
11 |
|
12 | |||
12 | echo % clone foo-base to foo-work |
|
13 | $ cd work | |
13 | hg clone foo-base foo-work |
|
14 | $ echo 'beta' > beta | |
|
15 | $ hg ci -A -m 'add beta' | |||
|
16 | adding beta | |||
|
17 | $ cd .. | |||
14 |
|
18 | |||
15 | echo % create beta in second repo |
|
19 | $ cd base | |
16 | cd foo-work |
|
20 | $ echo 'gamma' > gamma | |
17 | echo 'beta' > beta |
|
21 | $ hg ci -A -m 'add gamma' | |
18 | hg ci -A -m 'add beta' -d '2 0' |
|
22 | adding gamma | |
19 | cd .. |
|
23 | $ cd .. | |
20 |
|
24 | |||
21 | echo % create gamma in first repo |
|
25 | $ cd work | |
22 | cd foo-base |
|
26 | $ hg pull -q | |
23 | echo 'gamma' > gamma |
|
27 | $ hg merge | |
24 | hg ci -A -m 'add gamma' -d '3 0' |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 | cd .. |
|
29 | (branch merge, don't forget to commit) | |
26 |
|
30 | |||
27 | echo % pull into work and merge |
|
31 | Update --clean to revision 1 to simulate a failed merge: | |
28 | cd foo-work |
|
|||
29 | hg pull -q |
|
|||
30 | hg merge |
|
|||
31 |
|
32 | |||
32 | echo % revert to changeset 1 to simulate a failed merge |
|
33 | $ rm alpha beta gamma | |
33 | rm alpha beta gamma |
|
34 | $ hg update --clean 1 | |
34 | hg up -C 1 |
|
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
36 |
@@ -1,5 +1,3 b'' | |||||
1 | #!/bin/sh |
|
|||
2 |
|
||||
3 | # Source bundle was generated with the following script. |
|
1 | # Source bundle was generated with the following script. | |
4 | # |
|
2 | # | |
5 | # hg init |
|
3 | # hg init | |
@@ -11,22 +9,61 b'' | |||||
11 | # chmod +x b/a |
|
9 | # chmod +x b/a | |
12 | # hg ci -Amb -d'1 0' |
|
10 | # hg ci -Amb -d'1 0' | |
13 |
|
11 | |||
14 | hg init |
|
12 | $ hg init | |
15 | hg -q pull "$TESTDIR/test-manifest.hg" |
|
13 | $ hg -q pull "$TESTDIR/test-manifest.hg" | |
|
14 | ||||
|
15 | ||||
|
16 | The next call is expected to return nothing: | |||
|
17 | ||||
|
18 | $ hg manifest | |||
|
19 | ||||
|
20 | ||||
|
21 | $ hg co | |||
|
22 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
16 |
|
23 | |||
17 | echo % should be empty |
|
24 | $ hg manifest | |
18 | hg manifest |
|
25 | a | |
|
26 | b/a | |||
|
27 | l | |||
|
28 | ||||
|
29 | $ hg manifest -v | |||
|
30 | 644 a | |||
|
31 | 755 * b/a | |||
|
32 | 644 @ l | |||
|
33 | ||||
|
34 | $ hg manifest --debug | |||
|
35 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a | |||
|
36 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a | |||
|
37 | 047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l | |||
19 |
|
38 | |||
20 | hg co |
|
39 | $ hg manifest -r 0 | |
21 | hg manifest |
|
40 | a | |
22 | hg manifest -v |
|
41 | l | |
23 | hg manifest --debug |
|
42 | ||
24 |
hg manifest -r |
|
43 | $ hg manifest -r 1 | |
25 | hg manifest -r 1 |
|
44 | a | |
26 | hg manifest -r tip |
|
45 | b/a | |
|
46 | l | |||
|
47 | ||||
|
48 | $ hg manifest -r tip | |||
|
49 | a | |||
|
50 | b/a | |||
|
51 | l | |||
27 |
|
52 | |||
28 | echo % should fail |
|
53 | $ hg manifest tip | |
29 | hg manifest -r 2 |
|
54 | a | |
30 | hg manifest -r tip tip |
|
55 | b/a | |
|
56 | l | |||
|
57 | ||||
|
58 | ||||
|
59 | The next two calls are expected to abort: | |||
31 |
|
60 | |||
32 |
hg manifest |
|
61 | $ hg manifest -r 2 | |
|
62 | abort: unknown revision '2'! | |||
|
63 | ||||
|
64 | $ hg manifest -r tip tip | |||
|
65 | abort: please specify just one revision | |||
|
66 | ||||
|
67 | ||||
|
68 | $ true | |||
|
69 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
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