Mercurial > hg
view tests/test-issue660.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 | 8a5d8fb59ed2 |
children |
line wrap: on
line source
adding a adding b/b % file replaced with directory % should fail - would corrupt dirstate abort: file 'a' in dirstate clashes with 'a/a' % removing shadow % should succeed - shadow removed % directory replaced with file % should fail - would corrupt dirstate abort: directory 'b' already in dirstate % removing shadow % should succeed - shadow removed % look what we got A a/a A b R a R b/b % revert reintroducing shadow - should fail abort: file 'b' in dirstate clashes with 'b/b' % revert all - should succeed undeleting a forgetting a/a forgetting b undeleting b/b % addremove removing a adding a/a adding b removing b/b A a/a A b R a R b/b % commit C a/a C b % long directory replaced with file adding d/d/d % should fail - would corrupt dirstate abort: directory 'd' already in dirstate % removing shadow % should succeed - shadow removed % update should work at least with clean workdir 2 files updated, 0 files merged, 0 files removed, 0 files unresolved C a C b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved C a/a C b