view tests/test-586 @ 7226:b71a52f101dc

Make it possible to disable filtering for a pattern. Rationale: Apparently there were no way to disable for example win32text extension locally. RFC: Can it already be done another way?
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 14 Oct 2008 21:28:49 +0200
parents 720ae5085ee3
children f1af59451c0c
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