Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-double-merge @ 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 | 7706ff46ef45 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo line 1 > foo hg ci -qAm 'add foo' -d "1000000 0" # copy foo to bar and change both files hg cp foo bar echo line 2-1 >> foo echo line 2-2 >> bar hg ci -m 'cp foo bar; change both' -d "1000000 0" # in another branch, change foo in a way that doesn't conflict with # the other changes hg up -qC 0 echo line 0 > foo hg cat foo >> foo hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there hg merge --debug echo "-- foo --" cat foo echo "-- bar --" cat bar