[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision dab5af5f1b4e4aa174ebe3d5f722a71c8200
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3 |
Date: |
Sun, 9 Dec 2007 21:05:24 +0100 |
-----------------------------------------------------------------
Revision: dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3
Ancestor: 2c90515181da94d089443c045d317d685b44967f
Author: address@hidden
Date: 2007-12-09T20:00:04
Branch: net.venge.monotone.cleanup.conflict-messages
Modified files:
diff_patch.cc diff_patch.hh merge.cc
tests/conflict_messages/__driver__.lua
ChangeLog:
* diff_patch.{cc,hh} (content_merger::try_to_merge_files): split
into ...
(content_merger::try_auto_merge): ... this
(content_merger::try_user_merge): ... and this; so a full auto
merge pass can be done over all content conflicts before involving
the user
* merge.cc (get_file_details): move into anonymous namespace
(merge_method): new enum describing which merger to run
(try_to_merge_files): new function factored out of
resolve_merge_conflicts
(resolve_merge_conflicts): split merge into two passes (auto then
user) and report all remaining content conflicts before involving
the user
* tests/conflict_messages/__driver__.lua: add content conflicts
that should be resolved by the auto merger
monotone --db={your.database} diff
--revision=2c90515181da94d089443c045d317d685b44967f
--revision=dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision dab5af5f1b4e4aa174ebe3d5f722a71c82006fa3,
monotone <=