[Monotone-commits-nodiffs] Revision b820115c19a59896efc94997f50dd343e5049cd9

[monotone]

-----------------------------------------------------------------
Revision: b820115c19a59896efc94997f50dd343e5049cd9
Ancestor: 9c6432f6102857d3d054ca03e7d1c14aefd5879b
Author: address@hidden
Date: 2006-06-30T20:24:49
Branch: net.venge.monotone.multihead

Added files:
        tests/merge_multiple_heads_1/__driver__.lua
Added directories:
        tests/merge_multiple_heads_1
Modified files:
        cmd_merging.cc testsuite.lua

ChangeLog: 

Multihead merge heuristic.

        * cmd_merging.cc (CMD(merge)): Rewrite: merge heads
        from newest LCA to oldest.
        * tests/merge_multiple_heads_1: New test.
        * testsuite.lua: Add it.



monotone --db={your.database} diff 
--revision=9c6432f6102857d3d054ca03e7d1c14aefd5879b 
--revision=b820115c19a59896efc94997f50dd343e5049cd9
----------------------------------------------------------------------