Mercurial > hg
view tests/test-hardlinks-safety.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 | 14639c050251 |
| children |
line wrap: on
line source
% no diff if hardlink % init adding foo to series file applying foo now at: foo adding bar to series file applying bar now at: bar 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar % foo bar %%% 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo % foo patch foo finalized without changeset message patch bar finalized without changeset message %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo 430ed4828a74fa4047bc816a25500f7472ab4bfe bar % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo 430ed4828a74fa4047bc816a25500f7472ab4bfe lbar %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo