Show More
@@ -379,3 +379,53 b' Test rebase interrupted by hooks' | |||
|
379 | 379 | o 0:public 'A' |
|
380 | 380 | |
|
381 | 381 | $ cd .. |
|
382 | ||
|
383 | (pretxnclose version) | |
|
384 | ||
|
385 | $ cp -R a3 hook-pretxnclose | |
|
386 | $ cd hook-pretxnclose | |
|
387 | $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary: C"' | |
|
388 | rebasing 2:965c486023db "C" | |
|
389 | summary: C | |
|
390 | rebasing 6:a0b2430ebfb8 "F" (tip) | |
|
391 | transaction abort! | |
|
392 | rollback completed | |
|
393 | abort: pretxnclose hook exited with status 1 | |
|
394 | [255] | |
|
395 | $ hg tglogp | |
|
396 | @ 7:secret 'C' | |
|
397 | | | |
|
398 | | @ 6:secret 'F' | |
|
399 | | | | |
|
400 | o | 5:public 'B' | |
|
401 | | | | |
|
402 | o | 4:public 'E' | |
|
403 | | | | |
|
404 | o | 3:public 'D' | |
|
405 | | | | |
|
406 | | o 2:secret 'C' | |
|
407 | | | | |
|
408 | | o 1:public 'B' | |
|
409 | |/ | |
|
410 | o 0:public 'A' | |
|
411 | ||
|
412 | $ hg rebase --continue | |
|
413 | already rebased 2:965c486023db "C" as 401ccec5e39f | |
|
414 | rebasing 6:a0b2430ebfb8 "F" | |
|
415 | saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-backup.hg (glob) | |
|
416 | $ hg tglogp | |
|
417 | @ 6:secret 'F' | |
|
418 | | | |
|
419 | o 5:secret 'C' | |
|
420 | | | |
|
421 | o 4:public 'B' | |
|
422 | | | |
|
423 | o 3:public 'E' | |
|
424 | | | |
|
425 | o 2:public 'D' | |
|
426 | | | |
|
427 | | o 1:public 'B' | |
|
428 | |/ | |
|
429 | o 0:public 'A' | |
|
430 | ||
|
431 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now