Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
f1c7fa540327
Commit
f1c7fa540327
authored
7 years ago
by
Pierre-Yves David
Browse files
Options
Downloads
Patches
Plain Diff
issue with rebase and transaction
parent
dca4b5da417d
Branches
topic/stable/issue-rebase-transaction
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-rebase-interruptions.t
+52
-0
52 additions, 0 deletions
tests/test-rebase-interruptions.t
with
52 additions
and
0 deletions
tests/test-rebase-interruptions.t
+
52
−
0
View file @
f1c7fa54
...
...
@@ -327,6 +327,58 @@
|/
o 0: 4a2df7238c3b 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 ..
(pretxncommit version)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment