Mercurial > hg
view tests/test-mq-qpush-fail.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 <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | f3404b7f37ca |
children |
line wrap: on
line source
adding foo % test qpush on empty series no patches in series popping bad-patch popping patch2 popping patch1 patch queue now empty applying patch1 applying patch2 applying bad-patch transaction abort! rollback completed cleaning up working directory...done abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! changeset: 0:bbd179dfa0a7 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo % bar should be gone; other unknown/ignored files should still be around ? untracked-file I .hgignore C foo % preparing qpush of a missing patch no patches applied applying patch1 now at: patch1 % now we expect the push to fail, but it should NOT complain about patch1 applying patch2 unable to read patch2 now at: patch1 % preparing qpush of missing patch with no patch applied popping patch1 patch queue now empty % qpush should fail the same way as below applying patch1 unable to read patch1