[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] cvs_import rewrite
From: |
Daniel Carosone |
Subject: |
Re: [Monotone-devel] cvs_import rewrite |
Date: |
Fri, 16 Dec 2005 15:13:02 +1100 |
User-agent: |
Mutt/1.4.2.1i |
On Thu, Dec 15, 2005 at 03:53:10PM -0800, Nathaniel Smith wrote:
> > I.e. you don't absolutely need to sort by date. Overlapping commits in
> > CVS would better be handled as two heads which later got merged again in
> > monotone.
>
> Intriguing idea! How do you work out what the merge looks like?
Indeed it is, it sounds very good. I like this idea. A lot.
The merge, almost by definition, would be a matter of merging
manifests for unrelated changes to different files. If the commits
overlap in CVS on the same file, it's almost certain to have created a
conflict for the CVS users, and they'd then become separate commits
around that sequence point.
Someone's CVS repository is sure to prove me wrong, of course.
--
Dan.
pgpwL7vOUBOrE.pgp
Description: PGP signature
[Monotone-devel] Re: cvs_import rewrite, graydon hoare, 2005/12/16