Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 33120:b63351f6a246 | 33121:a5abaa81fad6 |
|---|---|
| 223 ignoring null merge rebase of 4 | 223 ignoring null merge rebase of 4 |
| 224 ignoring null merge rebase of 6 | 224 ignoring null merge rebase of 6 |
| 225 ignoring null merge rebase of 8 | 225 ignoring null merge rebase of 8 |
| 226 rebasing 9:e31216eec445 "more changes to f1" | 226 rebasing 9:e31216eec445 "more changes to f1" |
| 227 future parents are 2 and -1 | 227 future parents are 2 and -1 |
| 228 rebase status stored | |
| 228 update to 2:4bc80088dc6b | 229 update to 2:4bc80088dc6b |
| 229 resolving manifests | 230 resolving manifests |
| 230 branchmerge: False, force: True, partial: False | 231 branchmerge: False, force: True, partial: False |
| 231 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b | 232 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
| 232 f2.txt: other deleted -> r | 233 f2.txt: other deleted -> r |
| 248 committing manifest | 249 committing manifest |
| 249 committing changelog | 250 committing changelog |
| 250 rebased as 19c888675e13 | 251 rebased as 19c888675e13 |
| 251 rebasing 10:2f2496ddf49d "merge" (tip) | 252 rebasing 10:2f2496ddf49d "merge" (tip) |
| 252 future parents are 11 and 7 | 253 future parents are 11 and 7 |
| 254 rebase status stored | |
| 253 already in target | 255 already in target |
| 254 merge against 10:2f2496ddf49d | 256 merge against 10:2f2496ddf49d |
| 255 detach base 9:e31216eec445 | 257 detach base 9:e31216eec445 |
| 256 searching for copies back to rev 3 | 258 searching for copies back to rev 3 |
| 257 unmatched files in other (from topological common ancestor): | 259 unmatched files in other (from topological common ancestor): |
| 265 f1.txt | 267 f1.txt |
| 266 committing manifest | 268 committing manifest |
| 267 committing changelog | 269 committing changelog |
| 268 rebased as 2a7f09cac94c | 270 rebased as 2a7f09cac94c |
| 269 rebase merging completed | 271 rebase merging completed |
| 270 rebase status stored | |
| 271 update back to initial working directory parent | 272 update back to initial working directory parent |
| 272 resolving manifests | 273 resolving manifests |
| 273 branchmerge: False, force: False, partial: False | 274 branchmerge: False, force: False, partial: False |
| 274 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 | 275 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
| 275 f1.txt: other deleted -> r | 276 f1.txt: other deleted -> r |