foozy@708: #!/bin/bash
foozy@708: 
foozy@708: hg init orig
foozy@708: cd orig
foozy@708: echo foo > foo
foozy@708: hg ci -A -m 'First commit'
foozy@708: cd ..
foozy@708: 
foozy@708: #$ name: clone
foozy@708: 
foozy@708: hg clone orig anne
foozy@708: hg clone orig bob
foozy@708: 
foozy@708: #$ name: rename.anne
foozy@708: 
foozy@708: cd anne
foozy@708: hg mv foo bar
foozy@708: hg ci -m 'Rename foo to bar'
foozy@708: 
foozy@708: #$ name: rename.bob
foozy@708: 
foozy@708: cd ../bob
foozy@708: hg mv foo quux
foozy@708: hg ci -m 'Rename foo to quux'
foozy@708: 
foozy@708: #$ name: merge
foozy@708: # See http://www.selenic.com/mercurial/bts/issue455
foozy@708: 
foozy@708: cd ../orig
foozy@708: hg pull -u ../anne
foozy@708: hg pull ../bob
foozy@708: hg merge
foozy@708: ls