hgbook
annotate ja/examples/issue29 @ 1015:ef0132c0a014
some typo and better french translation
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Tue Nov 24 15:52:19 2009 +0100 (2009-11-24) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 #!/bin/bash |
| foozy@708 | 2 |
| foozy@708 | 3 #$ name: go |
| foozy@708 | 4 |
| foozy@708 | 5 hg init issue29 |
| foozy@708 | 6 cd issue29 |
| foozy@708 | 7 echo a > a |
| foozy@708 | 8 hg ci -Ama |
| foozy@708 | 9 echo b > b |
| foozy@708 | 10 hg ci -Amb |
| foozy@708 | 11 hg up 0 |
| foozy@708 | 12 mkdir b |
| foozy@708 | 13 echo b > b/b |
| foozy@708 | 14 hg ci -Amc |
| foozy@708 | 15 |
| foozy@708 | 16 #$ ignore: abort: Is a directory: .* |
| foozy@708 | 17 hg merge |
| foozy@708 | 18 |
| foozy@708 | 19 #$ name: |
| foozy@708 | 20 # This error is expected from the failed merge. |
| foozy@708 | 21 |
| foozy@708 | 22 exit 0 |