[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 2ce49d63199b5375fbd78522dc3a32caaf09
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 2ce49d63199b5375fbd78522dc3a32caaf099880 |
Date: |
Thu, 2 Feb 2006 19:05:24 +0100 |
-----------------------------------------------------------------
Revision: 2ce49d63199b5375fbd78522dc3a32caaf099880
Ancestor: 7baa379c35a569ba8e02c163282583294fc3ab55
Author: address@hidden
Date: 2006-02-02T17:46:32
Branch: net.venge.monotone
Modified files:
ChangeLog merge.cc roster_merge.cc roster_merge.hh
ChangeLog:
2006-02-02 Emile Snyder <address@hidden>
* merge.cc (resolve_merge_conflicts): If the merge has non-content
conflicts warn the user and abort before making them do content
merges. Move logging/warning of conflicts to methods in the
roster_merge_result struct.
* roster_merge.{cc,hh} (log_conflicts,
warn_non_content_conflicts): New methods to do the busy work of
logging or warning.
monotone --db={your.database} diff
--revision=7baa379c35a569ba8e02c163282583294fc3ab55
--revision=2ce49d63199b5375fbd78522dc3a32caaf099880
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 2ce49d63199b5375fbd78522dc3a32caaf099880,
monotone <=