[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 07b58d2bb24260d225e7a90785dd5b9f4e02
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 07b58d2bb24260d225e7a90785dd5b9f4e02d1f6 |
Date: |
Sun, 8 Feb 2009 21:47:10 +0100 |
-----------------------------------------------------------------
Revision: 07b58d2bb24260d225e7a90785dd5b9f4e02d1f6
Ancestor: 2da995c97cb3b095438b7683a5438ac14bef6565
Author: address@hidden
Date: 2009-02-08T05:16:55
Branch: net.venge.monotone
Added files:
merge_3way.cc merge_conflict.cc
Modified files:
Makefile.am merge_roster.cc po/POTFILES.in
ChangeLog:
Code reorganization to reduce number of modules linked into unit tester
(ninth and last)
Split all the code that interacts with user and database from
merge_roster.cc into a new file merge_conflict.cc. This enables
a massive prune of UNIT_TEST_OBJ_SUPPORT, at long last.
Also actually add merge_3way.cc to revision control; it should have
been in patch #7. Oops.
monotone --db={your.database} diff
--revision=2da995c97cb3b095438b7683a5438ac14bef6565
--revision=07b58d2bb24260d225e7a90785dd5b9f4e02d1f6
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 07b58d2bb24260d225e7a90785dd5b9f4e02d1f6,
monotone <=