Mercurial > hg
view tests/test-mq-qfold @ 9299:fbe7172026f7
help: un-indent list in "hg help diffs"
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 03 Aug 2009 00:02:00 +0200 |
parents | 2ff17c4de1da |
children | 296a0b14a686 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH filterdiff() { grep -v diff | \ sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" } echo '% init' hg init repo cd repo echo a > a hg ci -Am adda echo a >> a hg qnew -f p1 echo b >> a hg qnew -f p2 echo c >> a hg qnew -f p3 echo '% fold in the middle of the queue' hg qpop p1 hg qdiff | filterdiff hg qfold p2 hg qser hg qdiff | filterdiff echo '% fold with local changes' echo d >> a hg qfold p3 hg diff -c . | filterdiff cd ..