annotate en/examples/results/issue29.go.out @ 614:c8680784cdbb
Make builds more reliable.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 15:35:44 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN issue29.go -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>cd issue29</userinput>
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>echo a > a</userinput>
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
|
|
bos@156
|
6 adding a
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>echo b > b</userinput>
|
|
bos@564
|
8 <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
|
|
bos@156
|
9 adding b
|
|
bos@564
|
10 <prompt>$</prompt> <userinput>hg up 0</userinput>
|
|
bos@156
|
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
bos@564
|
12 <prompt>$</prompt> <userinput>mkdir b</userinput>
|
|
bos@564
|
13 <prompt>$</prompt> <userinput>echo b > b/b</userinput>
|
|
bos@564
|
14 <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
|
|
bos@156
|
15 adding b/b
|
|
hg@295
|
16 created new head
|
|
bos@564
|
17 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@156
|
18
|
|
bos@564
|
19 </screen>
|
|
bos@611
|
20 <!-- END issue29.go -->
|
