view tests/test-merge8 @ 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?

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update