Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 5206:0f6a1bdf89fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 720ae5085ee3
children
line wrap: on
line source

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A