equal
deleted
inserted
replaced
118 Rebase with no arguments (from 3 onto 8): |
118 Rebase with no arguments (from 3 onto 8): |
119 |
119 |
120 $ hg up -q -C 3 |
120 $ hg up -q -C 3 |
121 |
121 |
122 $ hg rebase |
122 $ hg rebase |
|
123 rebasing 1:42ccdea3bb16 "B" |
|
124 rebasing 2:5fddd98957c8 "C" |
|
125 rebasing 3:32af7686d403 "D" |
123 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
126 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
124 |
127 |
125 $ hg tglog |
128 $ hg tglog |
126 @ 8: 'D' |
129 @ 8: 'D' |
127 | |
130 | |
153 |
156 |
154 $ hg clone -q -u 3 a a2 |
157 $ hg clone -q -u 3 a a2 |
155 $ cd a2 |
158 $ cd a2 |
156 |
159 |
157 $ hg rebase --base . |
160 $ hg rebase --base . |
|
161 rebasing 1:42ccdea3bb16 "B" |
|
162 rebasing 2:5fddd98957c8 "C" |
|
163 rebasing 3:32af7686d403 "D" |
158 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
164 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
159 |
165 |
160 $ hg tglog |
166 $ hg tglog |
161 @ 8: 'D' |
167 @ 8: 'D' |
162 | |
168 | |
183 |
189 |
184 $ hg clone -q -u 3 a a3 |
190 $ hg clone -q -u 3 a a3 |
185 $ cd a3 |
191 $ cd a3 |
186 |
192 |
187 $ hg rebase --dest 'branch(.)' |
193 $ hg rebase --dest 'branch(.)' |
|
194 rebasing 1:42ccdea3bb16 "B" |
|
195 rebasing 2:5fddd98957c8 "C" |
|
196 rebasing 3:32af7686d403 "D" |
188 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
197 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
189 |
198 |
190 $ hg tglog |
199 $ hg tglog |
191 @ 8: 'D' |
200 @ 8: 'D' |
192 | |
201 | |
213 |
222 |
214 $ hg clone -q -u . a a4 |
223 $ hg clone -q -u . a a4 |
215 $ cd a4 |
224 $ cd a4 |
216 |
225 |
217 $ hg rebase --source 'desc("C")' |
226 $ hg rebase --source 'desc("C")' |
|
227 rebasing 2:5fddd98957c8 "C" |
|
228 rebasing 3:32af7686d403 "D" |
218 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
229 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
219 |
230 |
220 $ hg tglog |
231 $ hg tglog |
221 o 8: 'D' |
232 o 8: 'D' |
222 | |
233 | |
243 |
254 |
244 $ hg clone -q -u 3 a a5 |
255 $ hg clone -q -u 3 a a5 |
245 $ cd a5 |
256 $ cd a5 |
246 |
257 |
247 $ hg rebase --dest 6 |
258 $ hg rebase --dest 6 |
|
259 rebasing 1:42ccdea3bb16 "B" |
|
260 rebasing 2:5fddd98957c8 "C" |
|
261 rebasing 3:32af7686d403 "D" |
248 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
262 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
249 |
263 |
250 $ hg tglog |
264 $ hg tglog |
251 @ 8: 'D' |
265 @ 8: 'D' |
252 | |
266 | |
273 |
287 |
274 $ hg clone -q -u . a a6 |
288 $ hg clone -q -u . a a6 |
275 $ cd a6 |
289 $ cd a6 |
276 |
290 |
277 $ hg rebase --base 'desc("D")' |
291 $ hg rebase --base 'desc("D")' |
|
292 rebasing 1:42ccdea3bb16 "B" |
|
293 rebasing 2:5fddd98957c8 "C" |
|
294 rebasing 3:32af7686d403 "D" |
278 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
279 |
296 |
280 $ hg tglog |
297 $ hg tglog |
281 o 8: 'D' |
298 o 8: 'D' |
282 | |
299 | |
303 |
320 |
304 $ hg clone -q -u . a a7 |
321 $ hg clone -q -u . a a7 |
305 $ cd a7 |
322 $ cd a7 |
306 |
323 |
307 $ hg rebase --source 2 --dest 7 |
324 $ hg rebase --source 2 --dest 7 |
|
325 rebasing 2:5fddd98957c8 "C" |
|
326 rebasing 3:32af7686d403 "D" |
308 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
327 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
309 |
328 |
310 $ hg tglog |
329 $ hg tglog |
311 o 8: 'D' |
330 o 8: 'D' |
312 | |
331 | |
333 |
352 |
334 $ hg clone -q -u . a a8 |
353 $ hg clone -q -u . a a8 |
335 $ cd a8 |
354 $ cd a8 |
336 |
355 |
337 $ hg rebase --base 3 --dest 7 |
356 $ hg rebase --base 3 --dest 7 |
|
357 rebasing 1:42ccdea3bb16 "B" |
|
358 rebasing 2:5fddd98957c8 "C" |
|
359 rebasing 3:32af7686d403 "D" |
338 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
360 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
339 |
361 |
340 $ hg tglog |
362 $ hg tglog |
341 o 8: 'D' |
363 o 8: 'D' |
342 | |
364 | |
363 |
385 |
364 $ hg clone -q -u . a a9 |
386 $ hg clone -q -u . a a9 |
365 $ cd a9 |
387 $ cd a9 |
366 |
388 |
367 $ hg rebase --rev 'desc("C")::' |
389 $ hg rebase --rev 'desc("C")::' |
|
390 rebasing 2:5fddd98957c8 "C" |
|
391 rebasing 3:32af7686d403 "D" |
368 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
392 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
369 |
393 |
370 $ hg tglog |
394 $ hg tglog |
371 o 8: 'D' |
395 o 8: 'D' |
372 | |
396 | |
411 |
435 |
412 $ hg clone -q -u . b b1 |
436 $ hg clone -q -u . b b1 |
413 $ cd b1 |
437 $ cd b1 |
414 |
438 |
415 $ hg rebase -s 2 -d 1 --tool internal:local |
439 $ hg rebase -s 2 -d 1 --tool internal:local |
|
440 rebasing 2:e4e3f3546619 "c2b" (tip) |
416 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
441 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
417 |
442 |
418 $ hg cat c2 |
443 $ hg cat c2 |
419 c2 |
444 c2 |
420 |
445 |
423 |
448 |
424 $ hg clone -q -u . b b2 |
449 $ hg clone -q -u . b b2 |
425 $ cd b2 |
450 $ cd b2 |
426 |
451 |
427 $ hg rebase -s 2 -d 1 --tool internal:other |
452 $ hg rebase -s 2 -d 1 --tool internal:other |
|
453 rebasing 2:e4e3f3546619 "c2b" (tip) |
428 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
454 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
429 |
455 |
430 $ hg cat c2 |
456 $ hg cat c2 |
431 c2b |
457 c2b |
432 |
458 |
435 |
461 |
436 $ hg clone -q -u . b b3 |
462 $ hg clone -q -u . b b3 |
437 $ cd b3 |
463 $ cd b3 |
438 |
464 |
439 $ hg rebase -s 2 -d 1 --tool internal:fail |
465 $ hg rebase -s 2 -d 1 --tool internal:fail |
|
466 rebasing 2:e4e3f3546619 "c2b" (tip) |
440 unresolved conflicts (see hg resolve, then hg rebase --continue) |
467 unresolved conflicts (see hg resolve, then hg rebase --continue) |
441 [1] |
468 [1] |
442 |
469 |
443 $ hg summary |
470 $ hg summary |
444 parent: 1:56daeba07f4b |
471 parent: 1:56daeba07f4b |
455 |
482 |
456 $ hg resolve -m c2 |
483 $ hg resolve -m c2 |
457 (no more unresolved files) |
484 (no more unresolved files) |
458 $ hg rebase -c --tool internal:fail |
485 $ hg rebase -c --tool internal:fail |
459 tool option will be ignored |
486 tool option will be ignored |
|
487 rebasing 2:e4e3f3546619 "c2b" (tip) |
460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
488 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob) |
461 |
489 |
462 $ hg rebase -i |
490 $ hg rebase -i |
463 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') |
491 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') |
464 [255] |
492 [255] |