equal
deleted
inserted
replaced
132 |
132 |
133 $ hg rebase |
133 $ hg rebase |
134 rebasing 1:42ccdea3bb16 "B" |
134 rebasing 1:42ccdea3bb16 "B" |
135 rebasing 2:5fddd98957c8 "C" |
135 rebasing 2:5fddd98957c8 "C" |
136 rebasing 3:32af7686d403 "D" |
136 rebasing 3:32af7686d403 "D" |
137 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
137 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
138 |
138 |
139 $ hg tglog |
139 $ hg tglog |
140 @ 6: 'D' |
140 @ 6: 'D' |
141 | |
141 | |
142 o 5: 'C' |
142 o 5: 'C' |
166 |
166 |
167 $ hg rebase --base . |
167 $ hg rebase --base . |
168 rebasing 1:42ccdea3bb16 "B" |
168 rebasing 1:42ccdea3bb16 "B" |
169 rebasing 2:5fddd98957c8 "C" |
169 rebasing 2:5fddd98957c8 "C" |
170 rebasing 3:32af7686d403 "D" |
170 rebasing 3:32af7686d403 "D" |
171 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
171 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
172 |
172 |
173 $ hg tglog |
173 $ hg tglog |
174 @ 6: 'D' |
174 @ 6: 'D' |
175 | |
175 | |
176 o 5: 'C' |
176 o 5: 'C' |
195 |
195 |
196 $ hg rebase --dest 'branch(.)' |
196 $ hg rebase --dest 'branch(.)' |
197 rebasing 1:42ccdea3bb16 "B" |
197 rebasing 1:42ccdea3bb16 "B" |
198 rebasing 2:5fddd98957c8 "C" |
198 rebasing 2:5fddd98957c8 "C" |
199 rebasing 3:32af7686d403 "D" |
199 rebasing 3:32af7686d403 "D" |
200 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
200 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
201 |
201 |
202 $ hg tglog |
202 $ hg tglog |
203 @ 8: 'D' |
203 @ 8: 'D' |
204 | |
204 | |
205 o 7: 'C' |
205 o 7: 'C' |
227 $ cd a4 |
227 $ cd a4 |
228 |
228 |
229 $ hg rebase --source 'desc("C")' |
229 $ hg rebase --source 'desc("C")' |
230 rebasing 2:5fddd98957c8 "C" |
230 rebasing 2:5fddd98957c8 "C" |
231 rebasing 3:32af7686d403 "D" |
231 rebasing 3:32af7686d403 "D" |
232 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
232 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
233 |
233 |
234 $ hg tglog |
234 $ hg tglog |
235 o 6: 'D' |
235 o 6: 'D' |
236 | |
236 | |
237 o 5: 'C' |
237 o 5: 'C' |
256 |
256 |
257 $ hg rebase --dest 6 |
257 $ hg rebase --dest 6 |
258 rebasing 1:42ccdea3bb16 "B" |
258 rebasing 1:42ccdea3bb16 "B" |
259 rebasing 2:5fddd98957c8 "C" |
259 rebasing 2:5fddd98957c8 "C" |
260 rebasing 3:32af7686d403 "D" |
260 rebasing 3:32af7686d403 "D" |
261 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
261 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
262 |
262 |
263 $ hg tglog |
263 $ hg tglog |
264 @ 8: 'D' |
264 @ 8: 'D' |
265 | |
265 | |
266 o 7: 'C' |
266 o 7: 'C' |
289 |
289 |
290 $ hg rebase --base 'desc("D")' |
290 $ hg rebase --base 'desc("D")' |
291 rebasing 1:42ccdea3bb16 "B" |
291 rebasing 1:42ccdea3bb16 "B" |
292 rebasing 2:5fddd98957c8 "C" |
292 rebasing 2:5fddd98957c8 "C" |
293 rebasing 3:32af7686d403 "D" |
293 rebasing 3:32af7686d403 "D" |
294 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
294 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
295 |
295 |
296 $ hg tglog |
296 $ hg tglog |
297 o 6: 'D' |
297 o 6: 'D' |
298 | |
298 | |
299 o 5: 'C' |
299 o 5: 'C' |
317 $ cd a7 |
317 $ cd a7 |
318 |
318 |
319 $ hg rebase --source 2 --dest 7 |
319 $ hg rebase --source 2 --dest 7 |
320 rebasing 2:5fddd98957c8 "C" |
320 rebasing 2:5fddd98957c8 "C" |
321 rebasing 3:32af7686d403 "D" |
321 rebasing 3:32af7686d403 "D" |
322 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
322 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
323 |
323 |
324 $ hg tglog |
324 $ hg tglog |
325 o 8: 'D' |
325 o 8: 'D' |
326 | |
326 | |
327 o 7: 'C' |
327 o 7: 'C' |
350 |
350 |
351 $ hg rebase --base 3 --dest 7 |
351 $ hg rebase --base 3 --dest 7 |
352 rebasing 1:42ccdea3bb16 "B" |
352 rebasing 1:42ccdea3bb16 "B" |
353 rebasing 2:5fddd98957c8 "C" |
353 rebasing 2:5fddd98957c8 "C" |
354 rebasing 3:32af7686d403 "D" |
354 rebasing 3:32af7686d403 "D" |
355 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
355 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
356 |
356 |
357 $ hg tglog |
357 $ hg tglog |
358 o 8: 'D' |
358 o 8: 'D' |
359 | |
359 | |
360 o 7: 'C' |
360 o 7: 'C' |
382 $ cd a9 |
382 $ cd a9 |
383 |
383 |
384 $ hg rebase --rev 'desc("C")::' |
384 $ hg rebase --rev 'desc("C")::' |
385 rebasing 2:5fddd98957c8 "C" |
385 rebasing 2:5fddd98957c8 "C" |
386 rebasing 3:32af7686d403 "D" |
386 rebasing 3:32af7686d403 "D" |
387 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
387 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
388 |
388 |
389 $ hg tglog |
389 $ hg tglog |
390 o 6: 'D' |
390 o 6: 'D' |
391 | |
391 | |
392 o 5: 'C' |
392 o 5: 'C' |
408 $ hg clone -q -u . a aX |
408 $ hg clone -q -u . a aX |
409 $ cd aX |
409 $ cd aX |
410 $ hg rebase -r 3 -r 6 --dest 8 |
410 $ hg rebase -r 3 -r 6 --dest 8 |
411 rebasing 3:32af7686d403 "D" |
411 rebasing 3:32af7686d403 "D" |
412 rebasing 6:eea13746799a "G" |
412 rebasing 6:eea13746799a "G" |
413 saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-backup.hg (glob) |
413 saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg (glob) |
414 $ cd .. |
414 $ cd .. |
415 |
415 |
416 Test --tool parameter: |
416 Test --tool parameter: |
417 |
417 |
418 $ hg init b |
418 $ hg init b |
438 $ cd b1 |
438 $ cd b1 |
439 |
439 |
440 $ hg rebase -s 2 -d 1 --tool internal:local |
440 $ hg rebase -s 2 -d 1 --tool internal:local |
441 rebasing 2:e4e3f3546619 "c2b" (tip) |
441 rebasing 2:e4e3f3546619 "c2b" (tip) |
442 note: rebase of 2:e4e3f3546619 created no changes to commit |
442 note: rebase of 2:e4e3f3546619 created no changes to commit |
443 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
443 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
444 |
444 |
445 $ hg cat c2 |
445 $ hg cat c2 |
446 c2 |
446 c2 |
447 |
447 |
448 $ cd .. |
448 $ cd .. |
451 $ hg clone -q -u . b b2 |
451 $ hg clone -q -u . b b2 |
452 $ cd b2 |
452 $ cd b2 |
453 |
453 |
454 $ hg rebase -s 2 -d 1 --tool internal:other |
454 $ hg rebase -s 2 -d 1 --tool internal:other |
455 rebasing 2:e4e3f3546619 "c2b" (tip) |
455 rebasing 2:e4e3f3546619 "c2b" (tip) |
456 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
456 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
457 |
457 |
458 $ hg cat c2 |
458 $ hg cat c2 |
459 c2b |
459 c2b |
460 |
460 |
461 $ cd .. |
461 $ cd .. |
491 (continue: hg rebase --continue) |
491 (continue: hg rebase --continue) |
492 [255] |
492 [255] |
493 $ hg rebase -c --tool internal:fail |
493 $ hg rebase -c --tool internal:fail |
494 rebasing 2:e4e3f3546619 "c2b" (tip) |
494 rebasing 2:e4e3f3546619 "c2b" (tip) |
495 note: rebase of 2:e4e3f3546619 created no changes to commit |
495 note: rebase of 2:e4e3f3546619 created no changes to commit |
496 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
496 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg (glob) |
497 |
497 |
498 $ hg rebase -i |
498 $ hg rebase -i |
499 abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") |
499 abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") |
500 [255] |
500 [255] |
501 |
501 |