1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/examples/rename.divergent	Tue Nov 10 19:48:42 2009 -0500
     1.3 @@ -0,0 +1,33 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +hg init orig
     1.7 +cd orig
     1.8 +echo foo > foo
     1.9 +hg ci -A -m 'First commit'
    1.10 +cd ..
    1.11 +
    1.12 +#$ name: clone
    1.13 +
    1.14 +hg clone orig anne
    1.15 +hg clone orig bob
    1.16 +
    1.17 +#$ name: rename.anne
    1.18 +
    1.19 +cd anne
    1.20 +hg mv foo bar
    1.21 +hg ci -m 'Rename foo to bar'
    1.22 +
    1.23 +#$ name: rename.bob
    1.24 +
    1.25 +cd ../bob
    1.26 +hg mv foo quux
    1.27 +hg ci -m 'Rename foo to quux'
    1.28 +
    1.29 +#$ name: merge
    1.30 +# See http://www.selenic.com/mercurial/bts/issue455
    1.31 +
    1.32 +cd ../orig
    1.33 +hg pull -u ../anne
    1.34 +hg pull ../bob
    1.35 +hg merge
    1.36 +ls