Skip to content
Snippets Groups Projects
Commit 918e7dcf8820 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

rebase: provides test case for (issue5610)

The 4.2 release introduces a regression regarding the behavior of rebase with
some hook failures. We add the tests from the bug report from Henrik Stuart to
our test base to prevent further regression on this.
parent a5abaa81fad6
No related branches found
No related tags found
No related merge requests found
......@@ -271,4 +271,56 @@
|/
o 0:public 'A'
Test rebase interrupted by hooks (pretxncommit)
$ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo F > F
$ hg add F
$ hg ci -m F
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxncommit=hg log -r $HG_NODE | grep "summary: C"'
rebasing 2:965c486023db "C"
summary: C
rebasing 6:a0b2430ebfb8 "F" (tip)
transaction abort!
rollback completed
abort: pretxncommit hook exited with status 1
[255]
$ hg tglogp
@ 7:secret 'C'
|
| @ 6:secret 'F'
| |
o | 5:public 'B'
| |
o | 4:public 'E'
| |
o | 3:public 'D'
| |
| o 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
$ hg rebase --continue
already rebased 2:965c486023db "C" as 401ccec5e39f
rebasing 6:a0b2430ebfb8 "F"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/965c486023db-aa6250e7-backup.hg (glob)
$ hg tglogp
@ 6:secret 'F'
|
o 5:secret 'C'
|
o 4:public 'B'
|
o 3:public 'E'
|
o 2:public 'D'
|
| o 1:public 'B'
|/
o 0:public 'A'
$ cd ..
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment