hgbook
annotate es/examples/rename.divergent @ 1006:c859c8d32838
french: small corrections on ch03
| author | William Dodé <wilk@flibuste.net> |
|---|---|
| date | Tue Sep 15 13:40:45 2009 +0200 (2009-09-15) |
| parents | |
| children |
| rev | line source |
|---|---|
| igor@333 | 1 #!/bin/bash |
| igor@333 | 2 |
| igor@333 | 3 hg init orig |
| igor@333 | 4 cd orig |
| igor@333 | 5 echo foo > foo |
| igor@333 | 6 hg ci -A -m 'First commit' |
| igor@333 | 7 cd .. |
| igor@333 | 8 |
| igor@333 | 9 #$ name: clone |
| igor@333 | 10 |
| igor@333 | 11 hg clone orig anne |
| igor@333 | 12 hg clone orig bob |
| igor@333 | 13 |
| igor@333 | 14 #$ name: rename.anne |
| igor@333 | 15 |
| igor@333 | 16 cd anne |
| igor@333 | 17 hg mv foo bar |
| igor@333 | 18 hg ci -m 'Rename foo to bar' |
| igor@333 | 19 |
| igor@333 | 20 #$ name: rename.bob |
| igor@333 | 21 |
| igor@333 | 22 cd ../bob |
| igor@333 | 23 hg mv foo quux |
| igor@333 | 24 hg ci -m 'Rename foo to quux' |
| igor@333 | 25 |
| igor@333 | 26 #$ name: merge |
| igor@333 | 27 # See http://www.selenic.com/mercurial/bts/issue455 |
| igor@333 | 28 |
| igor@333 | 29 cd ../orig |
| igor@333 | 30 hg pull -u ../anne |
| igor@333 | 31 hg pull ../bob |
| igor@333 | 32 hg merge |
| igor@333 | 33 ls |