Mercurial > hg

view tests/test-ro-message @ 4725:cf8b8f62688a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jun 2007 21:23:24 -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'