Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619 @ 5084:edfe69548e2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
posixfile_nt: '+' should allow read access. This fixes unexpected I/O error on committing many files due to cset:8a53b39cd402 (r4902 in crew).
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Wed, 25 Jul 2007 15:58:10 +0900
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