[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 87ee4825fa02d201b11663b826d33598026c
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 87ee4825fa02d201b11663b826d33598026c0bb4 |
Date: |
Thu, 20 Dec 2007 06:05:22 +0100 |
-----------------------------------------------------------------
Revision: 87ee4825fa02d201b11663b826d33598026c0bb4
Ancestor: f425680fa825c71deea1886c9df5e7cf28800349
Author: address@hidden
Date: 2007-12-19T03:32:35
Branch: net.venge.monotone.cleanup.conflict-messages
Modified files:
roster_merge.cc tests/conflict_messages/__driver__.lua
ChangeLog:
* roster_merge.cc (roster_merge_result::report_missing_root_conflicts):
use ancestral rosters to report missing root conflicts; adjust to
handle merge of unrelated projects more gracefully
* tests/conflict_messages/__driver__.lua: factor out common setup
method; use branch names in original content of files to avoid
creating duplicate revisions; add complex structural conflict
cases from roster_merge.cc; add a test for merging unrelated
projects
monotone --db={your.database} diff
--revision=f425680fa825c71deea1886c9df5e7cf28800349
--revision=87ee4825fa02d201b11663b826d33598026c0bb4
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 87ee4825fa02d201b11663b826d33598026c0bb4,
monotone <=