hgbook
view en/examples/backout @ 124:c9aad709bd3a
Document the backout command.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Dec 26 13:08:20 2006 -0800 (2006-12-26) |
| parents | |
| children | 627effec9d4e |
line source
1 #!/bin/bash
3 # We have to fake the merges here, because they cause conflicts with
4 # three-way command-line merge, and kdiff3 may not be available.
6 export HGMERGE=$(mktemp)
7 echo '#!/bin/sh' >> $HGMERGE
8 echo 'echo first change > "$1"' >> $HGMERGE
9 echo 'echo third change > "$1"' >> $HGMERGE
10 chmod 700 $HGMERGE
12 #$ name: init
14 hg init myrepo
15 cd myrepo
16 echo first change >> myfile
17 hg add myfile
18 hg commit -m 'first change'
19 echo second change >> myfile
20 hg commit -m 'second change'
22 #$ name: simple
24 hg backout -m 'back out second change' tip
25 cat myfile
27 #$ name: simple.log
29 hg log --style compact
31 #$ name: non-tip.clone
33 cd ..
34 hg clone -r1 myrepo non-tip-repo
35 cd non-tip-repo
37 #$ name: non-tip.backout
39 echo third change >> myfile
40 hg commit -m 'third change'
41 hg backout --merge -m 'back out second change' 1
43 #$ name: non-tip.cat
44 cat myfile
46 #$ name: manual.clone
48 cd ..
49 hg clone -r1 myrepo newrepo
50 cd newrepo
52 #$ name: manual.backout
54 echo third change >> myfile
55 hg commit -m 'third change'
56 hg backout -m 'back out second change' 1
58 #$ name: manual.log
60 hg log --style compact
62 #$ name: manual.parents
64 hg parents
66 #$ name: manual.heads
68 hg heads
70 #$ name: manual.cat
72 cat myfile
74 #$ name: manual.merge
76 hg merge
77 hg commit -m 'merged backout with previous tip'
78 cat myfile
80 #$ name:
82 rm $HGMERGE