|
From: | Markus Schiltknecht |
Subject: | Re: [Monotone-devel] Re: A better approach for cvs->mtn? |
Date: | Tue, 21 Nov 2006 15:38:27 +0100 |
User-agent: | Icedove 1.5.0.8 (X11/20061116) |
Hi, Bruce Stephens wrote:
But anyway, you just can't represent that at all accurately in something other than CVS or subversion: the branch happened at different times for different files. (And you can't represent the moving branch at all, since the information's lost even to CVS.) I guess you just have to do the best you can, and duplicate the files where necessary to make sure that the right files appear on the right branches and tags?
Yes.I'm planning to add some configurable options to tell the importer how to handle such conflicts. (Theoretically, everything monotone can't do should result in conflicts, i.e. the branch moving you described.)
In monotone, you would use propagation to achieve the very same. Although, I'm unsure how cvs_import could handle that... maybe
it's doable by manually telling it how to resolve *that* conflict.But I'm still far from that... :-( Somebody having the money to sponsor my work so I could quit my 50% php job I still do?
Regards Markus
[Prev in Thread] | Current Thread | [Next in Thread] |