Show More
@@ -49,3 +49,25 b' hg manifest' | |||||
49 |
|
49 | |||
50 | # ensure status is correct after merge |
|
50 | # ensure status is correct after merge | |
51 | hg qpop -a |
|
51 | hg qpop -a | |
|
52 | cd .. | |||
|
53 | ||||
|
54 | # Classic MQ merge sequence *with an explicit named queue* | |||
|
55 | echo | |||
|
56 | echo % init t2 | |||
|
57 | hg init t2 | |||
|
58 | cd t2 | |||
|
59 | echo a > a | |||
|
60 | hg ci -Am init | |||
|
61 | echo b >> a | |||
|
62 | hg ci -m changea | |||
|
63 | hg up -C 0 | |||
|
64 | echo c >> a | |||
|
65 | hg qnew -f -e patcha | |||
|
66 | echo % create the reference queue | |||
|
67 | hg qsave -c -e -n refqueue 2> /dev/null | |||
|
68 | hg up -C 1 | |||
|
69 | echo % merge | |||
|
70 | hg qpush -m -n refqueue 2>&1 | \ | |||
|
71 | sed 's/merging with queue at.*refqueue/merging with queue at refqueue/' | |||
|
72 | cd .. | |||
|
73 |
@@ -11,3 +11,14 b' applying rm_a' | |||||
11 | Now at: rm_a |
|
11 | Now at: rm_a | |
12 | b |
|
12 | b | |
13 | Patch queue now empty |
|
13 | Patch queue now empty | |
|
14 | ||||
|
15 | % init t2 | |||
|
16 | adding a | |||
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
18 | % create the reference queue | |||
|
19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
20 | % merge | |||
|
21 | merging with queue at refqueue | |||
|
22 | (working directory not at tip) | |||
|
23 | applying patcha | |||
|
24 | Now at: patcha |
General Comments 0
You need to be logged in to leave comments.
Login now