[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 84fb3ee2cbce574dfafcd648b90d4cec336d
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 84fb3ee2cbce574dfafcd648b90d4cec336de85f |
Date: |
Wed, 14 Dec 2005 13:31:34 UT |
-----------------------------------------------------------------
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.
monotone --db={your.database} diff
--revision=114be8fe0667ff11436ea0ceee40f28b0001b35a
--revision=84fb3ee2cbce574dfafcd648b90d4cec336de85f
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 84fb3ee2cbce574dfafcd648b90d4cec336de85f,
monotone <=