[Monotone-commits-diffs] Revision 84fb3ee2cbce574dfafcd648b90d4cec336de85f

[monotone]

-----------------------------------------------------------------
Revision: 84fb3ee2cbce574dfafcd648b90d4cec336de85f
Ancestor: 114be8fe0667ff11436ea0ceee40f28b0001b35a
Author: address@hidden
Date: 2005-12-09T12:29:03
Branch: net.venge.monotone.experiment.rosters

Modified files:
        roster.cc

ChangeLog: 

Add 1-parent cases.  Current status: top level drivers for all merge types
written.  Need to implement more scalar plug ins.  Need to restructure to
handle the funky cases attrs cause (where a 2 roster parent merge can
correspond to a 1 scalar parent merge, and so on) -- will require some
restructuring.

txtfXRvfx3loo.txt
Description: Diff [114be8fe0667ff11436ea0ceee40f28b0001b35a] -> [84fb3ee2cbce574dfafcd648b90d4cec336de85f]