view tests/test-issue619 @ 10900:cf016c9831d1

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)
author Greg Ward <greg-hg@gerg.ca>
date Tue, 13 Apr 2010 17:58:38 -0400
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