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