[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 9f20e15099d3610a1c2dd78ed1dc1f284c4a
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad |
Date: |
Fri, 23 May 2008 05:37:35 +0200 |
-----------------------------------------------------------------
Revision: 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad
Ancestor: 6823846e05751985cbb59d93af94f7a19f7a89d8
Author: address@hidden
Date: 2008-05-11T04:36:14
Branch: net.venge.monotone.mark-merge-existence
Modified files:
cmd_merging.cc merge.cc roster_merge.cc roster_merge.hh
ChangeLog:
* Pass the database reference into roster_merge() and uncomment the code
that looks for marks in the uncommon ancestors of the dead side.
monotone --db={your.database} diff
--revision=6823846e05751985cbb59d93af94f7a19f7a89d8
--revision=9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad,
monotone <=