Mercurial > hg
view tests/test-symlink-basic.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 | b9e0ddb04c5c |
children |
line wrap: on
line source
abort: dangling: file not tracked! changeset: 0:cabd88b706fc tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 files: dangling description: add symlink 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling % rev 0: dangling -> nothing % rev 1: dangling -> void % modifying link dangling -> empty % reverting to rev 0: reverting dangling dangling -> nothing % backups: dangling.orig -> empty 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % copies copying dangling to dangling2 A dangling2 dangling dangling -> void dangling2 -> void % issue995 0 files updated, 0 files merged, 0 files removed, 0 files unresolved