Mercurial > hg > gitweb

view tests/test-ro-message @ 3619:8c4fd0de5de8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.
author Matt Mackall <mpm@selenic.com>
date Tue, 07 Nov 2006 14:04:15 -0600
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'