hgbook
view en/examples/rename.divergent @ 273:00f69e8825c5
Bring book up to date with recent changes.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Nov 26 12:24:53 2007 -0800 (2007-11-26) |
| parents | |
| children | 3b640272a966 |
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 mv 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
33 ls