Mercurial > hg
view tests/test-branch-option @ 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 | 3d6915f5a2bb |
children |
line wrap: on
line source
#!/bin/sh # test branch selection options hg init branch cd branch hg branch a echo a > foo hg ci -d '0 0' -Ama echo a2 > foo hg ci -d '0 0' -ma2 hg up 0 hg branch c echo c > foo hg ci -d '0 0' -mc hg tag -l z cd .. hg clone -r 0 branch branch2 cd branch2 hg up 0 hg branch b echo b > foo hg ci -d '0 0' -mb hg up 0 hg --encoding utf-8 branch æ echo ae1 > foo hg ci -d '0 0' -mae1 hg up 0 hg --encoding utf-8 branch -f æ echo ae2 > foo hg ci -d '0 0' -mae2 hg up 0 hg branch -f b echo b2 > foo hg ci -d '0 0' -mb2 echo unknown branch and fallback hg in -qbz hg in -q ../branch#z hg out -qbz echo in rev c branch a hg in -qr c ../branch#a hg in -qr c -b a echo out branch . hg out -q ../branch#. hg out -q -b . echo out branch . non-ascii hg --encoding utf-8 up æ hg --encoding latin1 out -q ../branch#. hg --encoding latin1 out -q -b . echo clone branch b cd .. hg clone branch2#b branch3 hg -q -R branch3 heads b hg -q -R branch3 parents rm -rf branch3 echo clone rev a branch b hg clone -r a branch2#b branch3 hg -q -R branch3 heads b hg -q -R branch3 parents rm -rf branch3