Mercurial > hg-stable
view tests/test-churn @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | e3237af51def |
children | 717c35d55fb3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "churn=" >> $HGRCPATH echo % create test repository hg init repo cd repo echo a > a hg ci -Am adda -u user1 -d 6:00 echo b >> a echo b > b hg ci -m changeba -u user2 -d 9:00 a hg ci -Am addb -u user2 -d 9:30 echo c >> a echo c >> b echo c > c hg ci -m changeca -u user3 -d 12:00 a hg ci -m changecb -u user3 -d 12:15 b hg ci -Am addc -u user3 -d 12:30 mkdir -p d/e echo abc > d/e/f1.txt hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt mkdir -p d/g echo def > d/g/f2.txt hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt echo % churn separate directories cd d hg churn e echo % churn all hg churn echo % churn up to rev 2 hg churn -r :2 cd .. echo % churn with aliases cat > ../aliases <<EOF user1 alias1 user3 alias3 EOF hg churn --aliases ../aliases echo % churn with .hgchurn mv ../aliases .hgchurn hg churn rm .hgchurn echo % churn with column specifier COLUMNS=40 hg churn echo % churn by hour hg churn -f '%H' -s echo % churn with separated added/removed lines hg rm d/g/f2.txt hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt hg churn --diffstat echo % changeset number churn hg churn -c cd .. # issue 833: ZeroDivisionError hg init issue-833 cd issue-833 touch foo hg ci -Am foo # this was failing with a ZeroDivisionError hg churn cd ..