Mercurial > hg
diff tests/test-rebase-conflicts.t @ 33121:a5abaa81fad6 stable
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
Having a single transaction for rebase means the whole transaction gets rolled back
on error. To work around this a small hack has been added to detect merge
conflict and commit the work done so far before exiting. This hack works because
there is nothing transaction related going on during the merge phase.
However, if a hook blocks the rebase to create a changeset, it is too late to commit the
work done in the transaction before the problematic changeset was created. This
leads to the whole rebase so far being rolled back. Losing merge resolution and
other work in the process. (note: rebase state will be fully lost too).
Since issue5610 is a pretty serious regression and the next stable release is a
couple day away, we are taking the backout route until we can figure out
something better to do.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 27 Jun 2017 17:40:24 +0200 |
parents | cf8ad0e6c0e4 |
children | 40ee74bfa111 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Tue Jun 27 17:39:55 2017 +0200 +++ b/tests/test-rebase-conflicts.t Tue Jun 27 17:40:24 2017 +0200 @@ -225,6 +225,7 @@ ignoring null merge rebase of 8 rebasing 9:e31216eec445 "more changes to f1" future parents are 2 and -1 + rebase status stored update to 2:4bc80088dc6b resolving manifests branchmerge: False, force: True, partial: False @@ -250,6 +251,7 @@ rebased as 19c888675e13 rebasing 10:2f2496ddf49d "merge" (tip) future parents are 11 and 7 + rebase status stored already in target merge against 10:2f2496ddf49d detach base 9:e31216eec445 @@ -267,7 +269,6 @@ committing changelog rebased as 2a7f09cac94c rebase merging completed - rebase status stored update back to initial working directory parent resolving manifests branchmerge: False, force: False, partial: False