view en/examples/rename.divergent @ 825:d7d09cda83d2

Add paragraph IDs

#!/bin/bash

hg init orig
cd orig
echo foo > foo
hg ci -A -m 'First commit'
cd ..

#$ name: clone

hg clone orig anne
hg clone orig bob

#$ name: rename.anne

cd anne
hg rename foo bar
hg ci -m 'Rename foo to bar'

#$ name: rename.bob

cd ../bob
hg mv foo quux
hg ci -m 'Rename foo to quux'

#$ name: merge
# See http://www.selenic.com/mercurial/bts/issue455

cd ../orig
hg pull -u ../anne
hg pull ../bob
hg merge
ls