hgbook
view en/examples/rename.divergent @ 265:d9a1faa45c30
added a space between -m and the commit message.
| author | bab@draketo.de |
|---|---|
| date | Fri Aug 31 11:36:14 2007 +0200 (2007-08-31) |
| 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