foozy@708: #!/bin/bash
foozy@708: 
foozy@708: # We have to fake the merges here, because they cause conflicts with
foozy@708: # three-way command-line merge, and kdiff3 may not be available.
foozy@708: 
foozy@708: export HGMERGE=$(mktemp)
foozy@708: echo '#!/bin/sh' >> $HGMERGE
foozy@708: echo 'echo first change > "$1"' >> $HGMERGE
foozy@708: echo 'echo third change >> "$1"' >> $HGMERGE
foozy@708: chmod 700 $HGMERGE
foozy@708: 
foozy@708: #$ name: init
foozy@708: 
foozy@708: hg init myrepo
foozy@708: cd myrepo
foozy@708: echo first change >> myfile
foozy@708: hg add myfile
foozy@708: hg commit -m 'first change'
foozy@708: echo second change >> myfile
foozy@708: hg commit -m 'second change'
foozy@708: 
foozy@708: #$ name: simple
foozy@708: 
foozy@708: hg backout -m 'back out second change' tip
foozy@708: cat myfile
foozy@708: 
foozy@708: #$ name: simple.log
foozy@708: #$ ignore: \s+200[78]-.*
foozy@708: 
foozy@708: hg log --style compact
foozy@708: 
foozy@708: #$ name: non-tip.clone
foozy@708: 
foozy@708: cd ..
foozy@708: hg clone -r1 myrepo non-tip-repo
foozy@708: cd non-tip-repo
foozy@708: 
foozy@708: #$ name: non-tip.backout
foozy@708: 
foozy@708: echo third change >> myfile
foozy@708: hg commit -m 'third change'
foozy@708: hg backout --merge -m 'back out second change' 1
foozy@708: 
foozy@708: #$ name: non-tip.cat
foozy@708: cat myfile
foozy@708: 
foozy@708: #$ name: manual.clone
foozy@708: 
foozy@708: cd ..
foozy@708: hg clone -r1 myrepo newrepo
foozy@708: cd newrepo
foozy@708: 
foozy@708: #$ name: manual.backout
foozy@708: 
foozy@708: echo third change >> myfile
foozy@708: hg commit -m 'third change'
foozy@708: hg backout -m 'back out second change' 1
foozy@708: 
foozy@708: #$ name: manual.log
foozy@708: 
foozy@708: hg log --style compact
foozy@708: 
foozy@708: #$ name: manual.parents
foozy@708: 
foozy@708: hg parents
foozy@708: 
foozy@708: #$ name: manual.heads
foozy@708: 
foozy@708: hg heads
foozy@708: 
foozy@708: #$ name: manual.cat
foozy@708: 
foozy@708: cat myfile
foozy@708: 
foozy@708: #$ name: manual.merge
foozy@708: 
foozy@708: hg merge
foozy@708: hg commit -m 'merged backout with previous tip'
foozy@708: cat myfile
foozy@708: 
foozy@708: #$ name:
foozy@708: 
foozy@708: rm $HGMERGE