hgbook
annotate en/examples/issue29 @ 295:43bfadf9b760
Fixed sample output for 'issue29' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 21:50:17 2008 +0200 (2008-08-20) |
| parents | |
| children |
| rev | line source |
|---|---|
| bos@156 | 1 #!/bin/bash |
| bos@156 | 2 |
| bos@156 | 3 #$ name: go |
| bos@156 | 4 |
| bos@156 | 5 hg init issue29 |
| bos@156 | 6 cd issue29 |
| bos@156 | 7 echo a > a |
| bos@156 | 8 hg ci -Ama |
| bos@156 | 9 echo b > b |
| bos@156 | 10 hg ci -Amb |
| bos@156 | 11 hg up 0 |
| bos@156 | 12 mkdir b |
| bos@156 | 13 echo b > b/b |
| bos@156 | 14 hg ci -Amc |
| bos@156 | 15 |
| bos@156 | 16 #$ ignore: abort: Is a directory: .* |
| bos@156 | 17 hg merge |
| bos@156 | 18 |
| bos@156 | 19 #$ name: |
| bos@156 | 20 # This error is expected from the failed merge. |
| bos@156 | 21 |
| bos@156 | 22 exit 0 |