Mercurial > hg
view tests/test-share @ 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 | 2250fc372d34 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "share = " >> $HGRCPATH echo % prepare repo1 hg init repo1 cd repo1 echo a > a hg commit -A -m'init' echo % share it cd .. hg share repo1 repo2 echo % contents of repo2/.hg cd repo2 [ -d .hg/store ] \ && echo "fail: .hg/store should not exist" \ || echo "pass: .hg/store does not exist" # Some sed versions appends newline, some don't, and some just fails (cat .hg/sharedpath; echo) | head -n1 | "$TESTDIR/filtertmp.py" echo % commit in shared clone echo a >> a hg commit -m'change in shared clone' echo % check original cd ../repo1 hg log hg update cat a # should be two lines of "a" echo % commit in original echo b > b hg commit -A -m'another file' echo % check in shared clone cd ../repo2 hg log hg update cat b # should exist with one "b" echo % hg serve shared clone hg serve -n test -p $HGPORT -d --pid-file=hg.pid cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-file/'