Mercurial > public > mercurial-scm > hg

view tests/test-issue619 @ 8383:dcfdcb51ac5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: make mask a class variable since it's instance-independant
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 08 May 2009 16:40:39 +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