view tests/test-merge4 @ 5966:11af38a592ae

Register data filters in a localrepo instead of util

- Changing data filters implementation is easier, adddatafilter() can rewrap
  filter after inspecting their prototype
- Custom data filters really belongs to localrepo, mixing them with generic
  wrapper like "pipefilter" or "tempfilter" looks wrong.
- util.filtertable should not be accessed from extensions

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"