Mercurial > hg
diff tests/test-mq.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 | 64f284da1278 |
children | e2bce1c717fa a4fbbe0fbc38 |
line wrap: on
line diff
--- a/tests/test-mq.out Sat Jul 31 11:36:24 2010 +0900 +++ b/tests/test-mq.out Sat Jul 10 21:23:00 2010 +0200 @@ -209,6 +209,8 @@ popping test1b.patch popping test.patch patch queue now empty +cannot push 'test2.patch' - guarded by ['+posguard'] +number of unguarded, unapplied patches has changed from 2 to 3 applying test2.patch now at: test2.patch applying test1b.patch @@ -222,14 +224,23 @@ popping test1b.patch popping test2.patch patch queue now empty +guards deactivated +number of unguarded, unapplied patches has changed from 3 to 2 applying test.patch now at: test.patch applying test1b.patch now at: test1b.patch abort: patch bogus not in series +abort: please specify the patch to move abort: cannot push to a previous patch: test.patch applying test2.patch now at: test2.patch +% series after move +test.patch +test1b.patch +test2.patch +# comment + % pop, qapplied, qunapplied 0 A test.patch 1 A test1b.patch