hgbook: 613690ad6a9c en/examples/rename.divergent

hgbook

Merge with dongsheng

author	Bryan O'Sullivan <bos@serpentine.com>
date	Sat Jul 10 16:21:26 2010 +0100 (2010-07-10)
parents	91a936be78b8
children

line source

1 #!/bin/bash

3 hg init orig

4 cd orig

5 echo foo > foo

6 hg ci -A -m 'First commit'

7 cd ..

9 #$ name: clone

11 hg clone orig anne

12 hg clone orig bob

14 #$ name: rename.anne

16 cd anne

17 hg rename foo bar

18 hg ci -m 'Rename foo to bar'

20 #$ name: rename.bob

22 cd ../bob

23 hg mv foo quux

24 hg ci -m 'Rename foo to quux'

26 #$ name: merge

27 # See http://www.selenic.com/mercurial/bts/issue455

29 cd ../orig

30 hg pull -u ../anne

31 hg pull ../bob

32 hg merge