Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619 @ 5469:b12432b1c2c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.
author Steve Borho <steve@borho.org>
date Tue, 18 Sep 2007 19:53:01 -0500
parents 8808ea7da86b
children
line wrap: on
line source

#!/bin/sh

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

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done