Mercurial > hg
view tests/test-mq-qrename @ 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 | 0c944b7af564 |
children | 4ae3e5dffa60 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew -mmqbase mqbase hg qrename mqbase renamed mkdir .hg/patches/foo hg qrename renamed foo hg qseries ls .hg/patches/foo mkdir .hg/patches/bar hg qrename foo/renamed bar hg qseries ls .hg/patches/bar hg qrename bar/renamed baz hg qseries ls .hg/patches/baz hg qrename baz new/dir hg qseries ls .hg/patches/new/dir cd .. echo % test patch being renamed before committed hg init b cd b hg qinit -c hg qnew x hg qrename y hg qcommit -m rename cd ..