Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-ro-message @ 3441:ef2e990f9047
imported patch foo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Oct 2006 22:34:43 -0500 |
parents | e506c14382fd |
children |
line wrap: on
line source
#!/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'