hgbook
view en/examples/mq.id @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
Fix test itself as well (now requires 'hg resolve').
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 22:00:46 2008 +0200 (2008-08-20) |
parents | 9d0432dc167a |
children |
line source
1 #!/bin/sh
3 echo '[extensions]' >> $HGRC
4 echo 'hgext.mq =' >> $HGRC
6 hg init a
7 cd a
8 hg qinit
9 echo 'int x;' > test.c
10 hg ci -Ama
12 hg qnew first.patch
13 echo 'float c;' >> test.c
14 hg qrefresh
16 hg qnew second.patch
17 echo 'double u;' > other.c
18 hg add other.c
19 hg qrefresh
21 #$ name: output
23 hg qapplied
24 hg log -r qbase:qtip
25 hg export second.patch
27 #$ name:
28 exit 0