view tests/test-conflict @ 5206:0f6a1bdf89fb

match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Aug 2007 14:03:56 -0500
parents 93a4e72b4f83
children
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status