Mercurial > hg
view tests/test-mq-qgoto.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 | 561ff8d9e4f0 |
| children |
line wrap: on
line source
adding a popping c.patch popping b.patch now at: a.patch applying b.patch applying c.patch now at: c.patch popping c.patch now at: b.patch % Using index popping b.patch now at: a.patch applying b.patch applying c.patch now at: c.patch % No warnings when using index popping bug141421 popping bug314159 popping c.patch now at: b.patch applying c.patch applying bug314159 now at: bug314159 % Detect ambiguous non-index patch name "14" is ambiguous: bug314159 bug141421 abort: patch 14 not in series