Mercurial > hg

view tests/test-issue619 @ 8714:505a96cbc923

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add cp950 as problematic encoding which is used in chinese windows.
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Thu, 04 Jun 2009 21:23:31 +0900
parents 8808ea7da86b
children 4c94b6d0fb1c
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