[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 805e663619ced91f301f1e2214f1efa3e6196a
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 805e663619ced91f301f1e2214f1efa3e6196a6b |
Date: |
Mon, 18 Aug 2008 03:33:06 +0200 |
-----------------------------------------------------------------
Revision: 805e663619ced91f301f1e2214f1efa3e6196a6b
Ancestor: 0e1b9d7942c906a1e796aa38dadf06a93fb7e5f1
Author: address@hidden
Date: 2008-08-03T20:52:47
Branch: net.venge.monotone.automate_show_conflict
Modified files:
roster_merge.cc roster_merge.hh ss-existence-merge.text
ChangeLog:
start implementing more thorough handling of suture during existence merge
phase; not done, just committing for backup.
* roster_merge.cc:
(insert_if_unborn_or_sutured): Change already_handled to contain pairs.
Code outline of algorithm.
* roster_merge.hh: add suture_drop_conflict type.
* ss-existence-merge.text: rewrite.
txtIb9J2K1dic.txt
Description: Diff [0e1b9d7942c906a1e796aa38dadf06a93fb7e5f1] -> [805e663619ced91f301f1e2214f1efa3e6196a6b]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 805e663619ced91f301f1e2214f1efa3e6196a6b,
monotone <=