Mercurial > hg
view tests/test-hardlinks-safety @ 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 | 7e5e13bee8f4 |
children |
line wrap: on
line source
#!/bin/sh # some implementations of cp can't create hardlinks cat > cp.py <<EOF from mercurial import util import sys util.copyfiles(sys.argv[1], sys.argv[2], hardlink=True) EOF # test hardlinking outside hg mkdir x echo foo > x/a python cp.py x y echo bar >> y/a echo % no diff if hardlink diff x/a y/a # test mq hardlinking echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo % init hg init a cd a hg qimport -n foo - << EOF # HG changeset patch # Date 1 0 diff -r 2588a8b53d66 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Wed Jul 23 15:54:29 2008 +0200 @@ -0,0 +1,1 @@ +a EOF hg qpush cd .. python cp.py a b cd b hg qimport -n bar - << EOF # HG changeset patch # Date 2 0 diff -r 2588a8b53d66 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Wed Jul 23 15:54:29 2008 +0200 @@ -0,0 +1,1 @@ +b EOF hg qpush cat .hg/patches/status echo % cat .hg/patches/series echo %%% cat ../a/.hg/patches/status echo % cat ../a/.hg/patches/series # test tags hardlinking hg qdel -r qbase:qtip hg tag -l lfoo hg tag foo cd .. python cp.py b c cd c hg tag -l -r 0 lbar hg tag -r 0 bar echo %%% cat .hgtags echo % cat .hg/localtags echo %%% cat ../b/.hgtags echo % cat ../b/.hg/localtags