Mercurial > hg
view tests/test-rename-after-merge.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 | 39e7f14a8286 |
children |
line wrap: on
line source
% create source repository adding a % fork source repository updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository % merge repositories pulling from ../t2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b % rename b as c A c R b % rename back c as b M b % test issue 1476 adding a adding b1 adding b2 0 files updated, 0 files merged, 2 files removed, 0 files unresolved adding c1 adding c2 created new head % merge heads 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % commit issue 1476 copies: c2 (c1) rolling back to revision 2 (undo commit) 2 files updated, 0 files merged, 2 files removed, 0 files unresolved % merge heads again 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % commit issue 1476 with a rename on the other side copies: b2 (b1)