Mercurial > hg

view tests/test-issue619 @ 12180:45e654e10e1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rename test for better grouping
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 08 Sep 2010 15:18:33 +0200
parents 4c94b6d0fb1c
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama
echo b > b
hg branch b
hg ci -Amb
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge

echo bogus fast-forward should fail
hg merge b

echo done