Mercurial > hg
comparison tests/test-mq-safety @ 6042:2da5b19a6460
Merge with crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 06 Feb 2008 19:57:52 -0800 |
parents | dcda0c90125c |
children | 5b7da468531b |
comparison
equal
deleted
inserted
replaced
6041:dd714452c26e | 6042:2da5b19a6460 |
---|---|
1 #!/bin/sh | |
2 | |
3 echo '[extensions]' >> $HGRCPATH | |
4 echo 'hgext.mq =' >> $HGRCPATH | |
5 | |
6 hg init repo | |
7 cd repo | |
8 | |
9 echo foo > foo | |
10 hg ci -qAm 'add a file' | |
11 | |
12 hg qinit | |
13 | |
14 hg qnew foo | |
15 echo foo >> foo | |
16 hg qrefresh -m 'append foo' | |
17 | |
18 hg qnew bar | |
19 echo bar >> foo | |
20 hg qrefresh -m 'append bar' | |
21 | |
22 echo '% try to commit on top of a patch' | |
23 echo quux >> foo | |
24 hg ci -m 'append quux' | |
25 | |
26 # cheat a bit... | |
27 mv .hg/patches .hg/patches2 | |
28 hg ci -m 'append quux' | |
29 mv .hg/patches2 .hg/patches | |
30 | |
31 echo '% qpop/qrefresh on the wrong revision' | |
32 hg qpop | |
33 hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/' | |
34 hg qrefresh | |
35 | |
36 hg up -C qtip | |
37 echo '% qpop' | |
38 hg qpop | |
39 | |
40 echo '% qrefresh' | |
41 hg qrefresh | |
42 | |
43 echo '% tip:' | |
44 hg tip --template '#rev# #desc#\n' |