Mercurial > hg
view tests/test-mq-qdiff @ 7142:88f1b8081f1c
Prevent import over an applied patch (closes issue795)
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 18 Oct 2008 13:22:29 -0700 |
parents | 034f444902d9 |
children | 3f522d2fa633 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo % init hg init a cd a echo % commit echo 'base' > base hg ci -Ambase -d '1 0' echo % qnew mqbase hg qnew -mmqbase mqbase echo % qrefresh echo 'patched' > base hg qrefresh echo % qdiff hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo % qdiff dirname hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" echo % qdiff filename hg qdiff --nodates base echo % revert hg revert -a echo % qpop hg qpop echo % qdelete mqbase hg qdelete mqbase echo % commit 2 printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines hg ci -Amlines -d '2 0' echo % qnew 2 hg qnew -mmqbase2 mqbase2 printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines echo % qdiff -U 1 hg qdiff --nodates -U 1 echo % qdiff -b hg qdiff --nodates -b echo % qdiff -U 1 -B hg qdiff --nodates -U 1 -B echo qdiff -w hg qdiff --nodates -w