hgbook
view es/examples/rename.divergent @ 461:67d34d8b6ba0
translated up to the "writing an in-process hook" section
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Tue Dec 23 12:57:21 2008 -0500 (2008-12-23) |
| parents | |
| 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 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