view tests/test-rollback.out @ 11715:4f9dfb54c8b5 stable

qpush --move: move the right patch even with comment lines

88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.

Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.

Original patch contributed by Mads Kiilerich <[e-mail]>

checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
changeset:   0:0acdaf898367
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     test

rolling back to revision -1 (undo commit)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
A a
% Test issue 902
marked working directory as branch test
rolling back to revision -1 (undo commit)
default
% Test issue 1635 (commit message saved)
.hg/last-message.txt:
test2
% Test rollback of hg before issue 902 was fixed
marked working directory as branch test
rolling back to revision -1 (undo commit)
Named branch could not be reset, current branch still is: test
test
% rollback by pretxncommit saves commit message (issue 1635)
transaction abort!
rollback completed
abort: pretxncommit hook exited ...
.hg/last-message.txt:
precious commit message
% same thing, but run $EDITOR
transaction abort!
rollback completed
note: commit message saved in .hg/last-message.txt
abort: pretxncommit hook exited ...
.hg/last-message.txt:
another precious commit message