[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision c057649453262365703fe4a74d9a87d921ea82
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision c057649453262365703fe4a74d9a87d921ea8202 |
Date: |
Mon, 14 Jan 2008 12:07:51 +0100 |
-----------------------------------------------------------------
Revision: c057649453262365703fe4a74d9a87d921ea8202
Ancestor: d5b5f13293ca52a1017cf9e7532969e871bb0b32
Author: address@hidden
Date: 2008-01-14T10:16:56
Branch: net.venge.monotone.cvsimport-branch-reconstruction
Modified files:
rcs_import.cc
ChangeLog:
* Instead of trying to find a common ancestor, we now keep the common
ancestor and try to resolve the above cross path first. This makes
deferring cross edge resolution unnecessary again, as we correctly
resolve them in the order we want (resolution of lower cross edges
might depend on how above cross edges have been resolved).
txt2k75p0tQ75.txt
Description: Diff [d5b5f13293ca52a1017cf9e7532969e871bb0b32] -> [c057649453262365703fe4a74d9a87d921ea8202]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision c057649453262365703fe4a74d9a87d921ea8202,
monotone <=