changeset 6042 | 2da5b19a6460 |
parent 6041 | dd714452c26e |
parent 6037 | dd3267698d84 |
child 6043 | 6283316bcfd4 |
6041:dd714452c26e | 6042:2da5b19a6460 |
---|---|
1 #!/bin/sh |
|
2 HG=hg |
|
3 "$HG" init |
|
4 mkdir b |
|
5 echo 'Bouncy' >b/bouncy |
|
6 echo 'tricycle' >b/vehicle |
|
7 "$HG" add b/bouncy |
|
8 "$HG" add b/vehicle |
|
9 "$HG" commit -m 'Adding bouncy' |
|
10 echo 'bouncy' >>b/bouncy |
|
11 "$HG" commit -m 'Making it bouncier' |
|
12 "$HG" update -C 0 |
|
13 echo 'stationary' >>b/vehicle |
|
14 "$HG" commit -m 'Clarifying the vehicle.' |
|
15 "$HG" update -C 1 |
|
16 chmod a-w b/vehicle |
|
17 "$HG" merge 2 2>&1 | sed 's|^\(.*[ ]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g' |