Mercurial > hg
view tests/test-mq-safety @ 10609:5ee3faa7c563
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 07 Mar 2010 22:04:35 -0600 |
parents | 2e3ec7ef5349 |
children | ab237534d800 |
line wrap: on
line source
#!/bin/sh echo '[extensions]' >> $HGRCPATH echo 'mq =' >> $HGRCPATH hg init repo cd repo echo foo > foo hg ci -qAm 'add a file' hg qinit hg qnew foo echo foo >> foo hg qrefresh -m 'append foo' hg qnew bar echo bar >> foo hg qrefresh -m 'append bar' echo '% try to commit on top of a patch' echo quux >> foo hg ci -m 'append quux' # cheat a bit... mv .hg/patches .hg/patches2 hg ci -m 'append quux' mv .hg/patches2 .hg/patches echo '% qpop/qrefresh on the wrong revision' hg qpop hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/' hg qrefresh hg up -C qtip echo '% qpop' hg qpop echo '% qrefresh' hg qrefresh echo '% tip:' hg tip --template '{rev} {desc}\n' echo '% qpush warning branchheads' cd .. hg init branchy cd branchy echo q > q hg add q hg qnew -f qp hg qpop echo a > a hg ci -Ama hg up null hg branch b echo c > c hg ci -Amc hg merge default hg ci -mmerge hg up default hg log hg qpush