Mercurial > hg
view tests/test-rebase-rename @ 8819:e93ab347c814
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong
This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails. Failure is more frequent with faster hardware.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | b969611064ae |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "rebase=" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "git=1" >> $HGRCPATH BASE=`pwd` cleanoutput () { sed -e 's/\(Rebase status stored to\).*/\1/' \ -e 's/\(Rebase status restored from\).*/\1/' \ -e 's/\(saving bundle to \).*/\1/' } hg init repo1 cd repo1 echo "a">a hg commit -Am "A" --date '0 0' echo "b"> b hg commit -Am "B" --date '1 0' hg up -C 0 hg mv a a-renamed hg commit -m 'rename A' --date '2 0' echo echo '% Rename is tracked' hg log -p -r tip --template '{rev}:{desc}\n' echo '% Rebase the revision containing the rename' hg rebase -s 2 -d 1 --quiet 2>&1 | cleanoutput echo echo '% Rename is not lost' hg log -p -r tip --template '{rev}:{desc}\n' cd $BASE rm -rf repo1 hg init repo1 cd repo1 echo "a">a hg commit -Am "A" --date '0 0' echo "b"> b hg commit -Am "B" --date '1 0' hg up -C 0 hg cp a a-copied hg commit -m 'copy A' --date '2 0' echo echo '% Copy is tracked' hg log -p -r tip --template '{rev}:{desc}\n' echo '% Rebase the revision containing the copy' hg rebase -s 2 -d 1 --quiet 2>&1 | cleanoutput echo echo '% Copy is not lost' hg log -p -r tip --template '{rev}:{desc}\n'