Mercurial > hg
view tests/test-mq-qqueue.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 | e8a66a40474d |
children | 9b771b4ce2f3 |
line wrap: on
line source
%% default queue patches (active) %% applied patches in default queue somestuff %% try to change patch (create succeeds, switch fails) abort: patches applied - cannot set new queue active foo patches (active) %% empty default queue popping somestuff patch queue now empty %% switch queue foo (active) patches %% fail creating queue with already existing name abort: queue "foo" already exists foo (active) patches %% unapplied patches %% fail switching back abort: patches applied - cannot set new queue active %% fail deleting current abort: cannot delete currently active queue %% switch back and delete foo popping otherstuff patch queue now empty patches (active) %% tricky cases patches store (active) popping journal patch queue now empty somestuff %% invalid names abort: invalid queue name, may not contain the characters ":\/." abort: invalid queue name, may not contain the characters ":\/."