author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Thu, 07 Sep 2006 14:01:00 +0200 | |
changeset 3062 | 32fd512ca7c0 |
parent 2283 | e506c14382fd |
permissions | -rwxr-xr-x |
#!/bin/sh HG=hg "$HG" init mkdir b echo 'Bouncy' >b/bouncy echo 'tricycle' >b/vehicle "$HG" add b/bouncy "$HG" add b/vehicle "$HG" commit -m 'Adding bouncy' echo 'bouncy' >>b/bouncy "$HG" commit -m 'Making it bouncier' "$HG" update -C 0 echo 'stationary' >>b/vehicle "$HG" commit -m 'Clarifying the vehicle.' "$HG" update -C 1 chmod a-w b/vehicle "$HG" merge 2 2>&1 | sed 's|^\(.*[ ]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g'