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