Mercurial > hg
view tests/test-mq-qdelete @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
parents | b9a7c07fca0e |
children | 04b2c1e27c26 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew a hg qnew b hg qnew c hg qdel c hg qpop hg qdel c hg qseries ls .hg/patches hg qpop hg qdel -k b ls .hg/patches hg qdel -r a hg qapplied hg log --template '{rev} {desc}\n' hg qnew d hg qnew e hg qnew f hg qdel -r e hg qdel -r qbase:e hg qapplied hg log --template '{rev} {desc}\n'