Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 12608:16b854cb80f1
tests: unify test-rebase*
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 01 Oct 2010 16:10:06 +0200 |
parents | tests/test-rebase-interruptions@2313dc4d9817 |
children | b19b4c1df066 |
comparison
equal
deleted
inserted
replaced
12607:1393a81b3bdc | 12608:16b854cb80f1 |
---|---|
1 $ cat >> $HGRCPATH <<EOF | |
2 > [extensions] | |
3 > graphlog= | |
4 > rebase= | |
5 > | |
6 > [alias] | |
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | |
8 > EOF | |
9 | |
10 | |
11 $ hg init a | |
12 $ cd a | |
13 | |
14 $ echo A > A | |
15 $ hg ci -Am A | |
16 adding A | |
17 | |
18 $ echo B > B | |
19 $ hg ci -Am B | |
20 adding B | |
21 | |
22 $ echo C >> A | |
23 $ hg ci -m C | |
24 | |
25 $ hg up -q -C 0 | |
26 | |
27 $ echo D >> A | |
28 $ hg ci -m D | |
29 created new head | |
30 | |
31 $ echo E > E | |
32 $ hg ci -Am E | |
33 adding E | |
34 | |
35 $ cd .. | |
36 | |
37 | |
38 Changes during an interruption - continue: | |
39 | |
40 $ hg clone -q -u . a a1 | |
41 $ cd a1 | |
42 | |
43 $ hg tglog | |
44 @ 4: 'E' | |
45 | | |
46 o 3: 'D' | |
47 | | |
48 | o 2: 'C' | |
49 | | | |
50 | o 1: 'B' | |
51 |/ | |
52 o 0: 'A' | |
53 | |
54 Rebasing B onto E: | |
55 | |
56 $ hg rebase -s 1 -d 4 | |
57 merging A | |
58 warning: conflicts during merge. | |
59 merging A failed! | |
60 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
61 [255] | |
62 | |
63 Force a commit on C during the interruption: | |
64 | |
65 $ hg up -q -C 2 | |
66 | |
67 $ echo 'Extra' > Extra | |
68 $ hg add Extra | |
69 $ hg ci -m 'Extra' | |
70 | |
71 $ hg tglog | |
72 @ 6: 'Extra' | |
73 | | |
74 | o 5: 'B' | |
75 | | | |
76 | o 4: 'E' | |
77 | | | |
78 | o 3: 'D' | |
79 | | | |
80 o | 2: 'C' | |
81 | | | |
82 o | 1: 'B' | |
83 |/ | |
84 o 0: 'A' | |
85 | |
86 Resume the rebasing: | |
87 | |
88 $ hg rebase --continue | |
89 merging A | |
90 warning: conflicts during merge. | |
91 merging A failed! | |
92 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
93 [255] | |
94 | |
95 Solve the conflict and go on: | |
96 | |
97 $ echo 'conflict solved' > A | |
98 $ rm A.orig | |
99 $ hg resolve -m A | |
100 | |
101 $ hg rebase --continue | |
102 warning: new changesets detected on source branch, not stripping | |
103 | |
104 $ hg tglog | |
105 @ 7: 'C' | |
106 | | |
107 | o 6: 'Extra' | |
108 | | | |
109 o | 5: 'B' | |
110 | | | |
111 o | 4: 'E' | |
112 | | | |
113 o | 3: 'D' | |
114 | | | |
115 | o 2: 'C' | |
116 | | | |
117 | o 1: 'B' | |
118 |/ | |
119 o 0: 'A' | |
120 | |
121 $ cd .. | |
122 | |
123 | |
124 Changes during an interruption - abort: | |
125 | |
126 $ hg clone -q -u . a a2 | |
127 $ cd a2 | |
128 | |
129 $ hg tglog | |
130 @ 4: 'E' | |
131 | | |
132 o 3: 'D' | |
133 | | |
134 | o 2: 'C' | |
135 | | | |
136 | o 1: 'B' | |
137 |/ | |
138 o 0: 'A' | |
139 | |
140 Rebasing B onto E: | |
141 | |
142 $ hg rebase -s 1 -d 4 | |
143 merging A | |
144 warning: conflicts during merge. | |
145 merging A failed! | |
146 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
147 [255] | |
148 | |
149 Force a commit on B' during the interruption: | |
150 | |
151 $ hg up -q -C 5 | |
152 | |
153 $ echo 'Extra' > Extra | |
154 $ hg add Extra | |
155 $ hg ci -m 'Extra' | |
156 | |
157 $ hg tglog | |
158 @ 6: 'Extra' | |
159 | | |
160 o 5: 'B' | |
161 | | |
162 o 4: 'E' | |
163 | | |
164 o 3: 'D' | |
165 | | |
166 | o 2: 'C' | |
167 | | | |
168 | o 1: 'B' | |
169 |/ | |
170 o 0: 'A' | |
171 | |
172 Abort the rebasing: | |
173 | |
174 $ hg rebase --abort | |
175 warning: new changesets detected on target branch, can't abort | |
176 [255] | |
177 | |
178 $ hg tglog | |
179 @ 6: 'Extra' | |
180 | | |
181 o 5: 'B' | |
182 | | |
183 o 4: 'E' | |
184 | | |
185 o 3: 'D' | |
186 | | |
187 | o 2: 'C' | |
188 | | | |
189 | o 1: 'B' | |
190 |/ | |
191 o 0: 'A' | |
192 | |
193 $ cd .. | |
194 |