user/linus/catlfish.git, branch pmerge2

Unbreak the ordinary tests.

2016-11-25T00:04:12+00:00

Parallelise merge_fetch.py.

2016-11-24T23:47:13+00:00

NOTE: Not supporting permdb yet!

We're still not passing the tests because merge_backup.py exits when
the secondary merge disappears.

WIP

2016-11-23T16:09:48+00:00

Merge can run as four separate processes, plus a fifth controlling
proces 'merge'.

Tests are limited to testcase1.py and they're failing because of the
test with the dead merge secondary. Tests are also time consuming
because they're waiting for 60s each time a merge needs to be
verified. This could be improved by peeking at the control files, for
example.

Add a bit of documentation.

2016-11-17T09:36:34+00:00

Move version numbers to head of file.

2016-11-17T07:11:22+00:00

Easier to spot here.

Remove unused code from test Makefile.

2016-10-18T13:10:02+00:00

Fix parsing bug in compileconfig.

Test failing merge backup

2016-10-14T14:54:57+00:00

Refactor tests

Make tests run independently from cwd

2016-10-13T13:16:29+00:00

Specify where to source test.shvars from ('./').

2016-10-06T14:54:24+00:00

For people without '.' in PATH.

Move test preparation to separate shell script

2016-10-05T13:07:46+00:00