hgbook
annotate en/examples/rename.divergent @ 169:f4a50cf01d13
Merge.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Mar 26 23:21:12 2007 -0700 (2007-03-26) |
| parents | |
| children | 3b640272a966 |
| rev | line source |
|---|---|
| bos@156 | 1 #!/bin/bash |
| bos@156 | 2 |
| bos@156 | 3 hg init orig |
| bos@156 | 4 cd orig |
| bos@156 | 5 echo foo > foo |
| bos@156 | 6 hg ci -A -m 'First commit' |
| bos@156 | 7 cd .. |
| bos@156 | 8 |
| bos@156 | 9 #$ name: clone |
| bos@156 | 10 |
| bos@156 | 11 hg clone orig anne |
| bos@156 | 12 hg clone orig bob |
| bos@156 | 13 |
| bos@156 | 14 #$ name: rename.anne |
| bos@156 | 15 |
| bos@156 | 16 cd anne |
| bos@156 | 17 hg mv foo bar |
| bos@156 | 18 hg ci -m 'Rename foo to bar' |
| bos@156 | 19 |
| bos@156 | 20 #$ name: rename.bob |
| bos@156 | 21 |
| bos@156 | 22 cd ../bob |
| bos@156 | 23 hg mv foo quux |
| bos@156 | 24 hg ci -m 'Rename foo to quux' |
| bos@156 | 25 |
| bos@156 | 26 #$ name: merge |
| bos@156 | 27 # See http://www.selenic.com/mercurial/bts/issue455 |
| bos@156 | 28 |
| bos@156 | 29 cd ../orig |
| bos@156 | 30 hg pull -u ../anne |
| bos@156 | 31 hg pull ../bob |
| bos@156 | 32 hg merge |
| bos@156 | 33 ls |