Show More
@@ -46,11 +46,14 b'' | |||
|
46 | 46 | |
|
47 | 47 | $ cd .. |
|
48 | 48 | |
|
49 | Version with only two heads (to allow default destination to work) | |
|
50 | ||
|
51 | $ hg clone -q -u . a a2heads -r 3 -r 8 | |
|
49 | 52 | |
|
50 | 53 | These fail: |
|
51 | 54 | |
|
52 |
$ hg clone -q -u . a a |
|
|
53 |
$ cd a |
|
|
55 | $ hg clone -q -u . a a0 | |
|
56 | $ cd a0 | |
|
54 | 57 | |
|
55 | 58 | $ hg rebase -s 8 -d 7 |
|
56 | 59 | nothing to rebase |
@@ -117,6 +120,9 b' These work:' | |||
|
117 | 120 | |
|
118 | 121 | Rebase with no arguments (from 3 onto 8): |
|
119 | 122 | |
|
123 | $ cd .. | |
|
124 | $ hg clone -q -u . a2heads a1 | |
|
125 | $ cd a1 | |
|
120 | 126 | $ hg up -q -C 3 |
|
121 | 127 | |
|
122 | 128 | $ hg rebase |
@@ -126,22 +132,18 b' Rebase with no arguments (from 3 onto 8)' | |||
|
126 | 132 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
|
127 | 133 | |
|
128 | 134 | $ hg tglog |
|
129 |
@ |
|
|
130 | | | |
|
131 | o 7: 'C' | |
|
135 | @ 6: 'D' | |
|
132 | 136 | | |
|
133 |
o |
|
|
137 | o 5: 'C' | |
|
134 | 138 | | |
|
135 |
o |
|
|
139 | o 4: 'B' | |
|
136 | 140 | | |
|
137 |
o |
|
|
141 | o 3: 'I' | |
|
138 | 142 | | |
|
139 |
|
|
|
140 |
| |
|
|
141 |
o |
|
|
142 |
| |
|
|
143 | | o 1: 'E' | |
|
144 | |/ | |
|
143 | o 2: 'H' | |
|
144 | | | |
|
145 | o 1: 'F' | |
|
146 | | | |
|
145 | 147 | o 0: 'A' |
|
146 | 148 | |
|
147 | 149 | Try to rollback after a rebase (fail): |
@@ -154,7 +156,7 b' Try to rollback after a rebase (fail):' | |||
|
154 | 156 | |
|
155 | 157 | Rebase with base == '.' => same as no arguments (from 3 onto 8): |
|
156 | 158 | |
|
157 | $ hg clone -q -u 3 a a2 | |
|
159 | $ hg clone -q -u 3 a2heads a2 | |
|
158 | 160 | $ cd a2 |
|
159 | 161 | |
|
160 | 162 | $ hg rebase --base . |
@@ -164,22 +166,18 b" Rebase with base == '.' => same as no ar" | |||
|
164 | 166 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
|
165 | 167 | |
|
166 | 168 | $ hg tglog |
|
167 |
@ |
|
|
168 | | | |
|
169 | o 7: 'C' | |
|
169 | @ 6: 'D' | |
|
170 | 170 | | |
|
171 |
o |
|
|
171 | o 5: 'C' | |
|
172 | 172 | | |
|
173 |
o |
|
|
173 | o 4: 'B' | |
|
174 | 174 | | |
|
175 |
o |
|
|
175 | o 3: 'I' | |
|
176 | 176 | | |
|
177 |
|
|
|
178 |
| |
|
|
179 |
o |
|
|
180 |
| |
|
|
181 | | o 1: 'E' | |
|
182 | |/ | |
|
177 | o 2: 'H' | |
|
178 | | | |
|
179 | o 1: 'F' | |
|
180 | | | |
|
183 | 181 | o 0: 'A' |
|
184 | 182 | |
|
185 | 183 | $ cd .. |
@@ -220,7 +218,7 b' Rebase with dest == branch(.) => same as' | |||
|
220 | 218 | |
|
221 | 219 | Specify only source (from 2 onto 8): |
|
222 | 220 | |
|
223 | $ hg clone -q -u . a a4 | |
|
221 | $ hg clone -q -u . a2heads a4 | |
|
224 | 222 | $ cd a4 |
|
225 | 223 | |
|
226 | 224 | $ hg rebase --source 'desc("C")' |
@@ -229,20 +227,16 b' Specify only source (from 2 onto 8):' | |||
|
229 | 227 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
|
230 | 228 | |
|
231 | 229 | $ hg tglog |
|
232 |
o |
|
|
230 | o 6: 'D' | |
|
233 | 231 | | |
|
234 |
o |
|
|
235 | | | |
|
236 | @ 6: 'I' | |
|
232 | o 5: 'C' | |
|
237 | 233 | | |
|
238 |
|
|
|
234 | @ 4: 'I' | |
|
239 | 235 | | |
|
240 |
|
|
|
241 |
| |
|
|
242 |
o |
|
|
243 |
| |
|
|
244 | | o 2: 'E' | |
|
245 | |/ | |
|
236 | o 3: 'H' | |
|
237 | | | |
|
238 | o 2: 'F' | |
|
239 | | | |
|
246 | 240 | | o 1: 'B' |
|
247 | 241 | |/ |
|
248 | 242 | o 0: 'A' |
@@ -285,7 +279,7 b' Specify only dest (from 3 onto 6):' | |||
|
285 | 279 | |
|
286 | 280 | Specify only base (from 1 onto 8): |
|
287 | 281 | |
|
288 | $ hg clone -q -u . a a6 | |
|
282 | $ hg clone -q -u . a2heads a6 | |
|
289 | 283 | $ cd a6 |
|
290 | 284 | |
|
291 | 285 | $ hg rebase --base 'desc("D")' |
@@ -295,22 +289,18 b' Specify only base (from 1 onto 8):' | |||
|
295 | 289 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
|
296 | 290 | |
|
297 | 291 | $ hg tglog |
|
298 |
o |
|
|
299 | | | |
|
300 | o 7: 'C' | |
|
292 | o 6: 'D' | |
|
301 | 293 | | |
|
302 |
o |
|
|
294 | o 5: 'C' | |
|
303 | 295 | | |
|
304 |
|
|
|
296 | o 4: 'B' | |
|
305 | 297 | | |
|
306 |
|
|
|
298 | @ 3: 'I' | |
|
307 | 299 | | |
|
308 |
|
|
|
309 |
| |
|
|
310 |
o |
|
|
311 |
| |
|
|
312 | | o 1: 'E' | |
|
313 | |/ | |
|
300 | o 2: 'H' | |
|
301 | | | |
|
302 | o 1: 'F' | |
|
303 | | | |
|
314 | 304 | o 0: 'A' |
|
315 | 305 | |
|
316 | 306 | $ cd .. |
@@ -383,7 +373,7 b' Specify base and dest (from 1 onto 7):' | |||
|
383 | 373 | |
|
384 | 374 | Specify only revs (from 2 onto 8) |
|
385 | 375 | |
|
386 | $ hg clone -q -u . a a9 | |
|
376 | $ hg clone -q -u . a2heads a9 | |
|
387 | 377 | $ cd a9 |
|
388 | 378 | |
|
389 | 379 | $ hg rebase --rev 'desc("C")::' |
@@ -392,20 +382,16 b' Specify only revs (from 2 onto 8)' | |||
|
392 | 382 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
|
393 | 383 | |
|
394 | 384 | $ hg tglog |
|
395 |
o |
|
|
385 | o 6: 'D' | |
|
396 | 386 | | |
|
397 |
o |
|
|
398 | | | |
|
399 | @ 6: 'I' | |
|
387 | o 5: 'C' | |
|
400 | 388 | | |
|
401 |
|
|
|
389 | @ 4: 'I' | |
|
402 | 390 | | |
|
403 |
|
|
|
404 |
| |
|
|
405 |
o |
|
|
406 |
| |
|
|
407 | | o 2: 'E' | |
|
408 | |/ | |
|
391 | o 3: 'H' | |
|
392 | | | |
|
393 | o 2: 'F' | |
|
394 | | | |
|
409 | 395 | | o 1: 'B' |
|
410 | 396 | |/ |
|
411 | 397 | o 0: 'A' |
General Comments 0
You need to be logged in to leave comments.
Login now