On Mon, Sep 10, 2007 at 05:02:27PM -0400, Nathan Gray wrote:
> On Mon, Sep 10, 2007 at 09:19:41PM +0100, Bruce Stephens wrote:
> > That's odd.  Works for me (going from CVS to git).  You did put subdir
> > only in the cvs section?
> 
> I was generating the config, and it appears the 'subdir' option gets
> placed under [project].  I moved it under [cvs:source], and presto!
> It now works exactly as I wanted

Unfortunately I have just discovered that it did not work 'exactly' as
I wanted.  I have several darcs patches which have been corrupted during
the conversion.

When our CVS was set up, there were several 'initial revision' commits
that spanned several CVS modules.

When using tailor to convert from CVS to darcs, I was able to read
from all of the CVS modules and put them into a single darcs repo.  It
appears that when run in this way, tailor reads all the commits from
one CVS module and converts them, then moves on to the next CVS module.

In this case, several CVS modules have commits at the same moment, by
the same author, with the same commit message.

It appears that darcs names its patch hashes using the timestamp, the
author name, and the patch name (and description?).

So, something like this happens during conversion:

  - convert 'initial revision' from CVS module one
  - convert other patches from CVS module one
  - convert 'initial revision' from CVS module two
  - darcs overwrites the patch file created for 'initial revision' from
    CVS module one with the patch file for 'initial revision' from CVS
    module two
  - convert other patches from CVS module two

The names of all the patches are correct, but the contents of the
'initial revision' patch are not complete, containing only the changes
for CVS module two.

I think this could be fixed by having tailor read the list of all
commits from each CVS module to convert, then convert the commits
in chronological order.  When two or more CVS modules have commits
which are named the same and have identical authors and timestamps,
these should be recorded into darcs as a single patch, rather than as
separate patches (or recorded separately using amend-record).

Is this an easy change?  Something that can be fixed relatively
quickly?  (Or, should I try to come up with an alternate way of fixing
this particular repo?).

Thanks so much for tailor.  It has allowed me to mostly not deal with
CVS for a couple of years.

-kolibrie

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor

Reply via email to