Tobias Gruetzmacher wrote: > On Mon, Dec 04, 2006 at 07:47:27AM +0100, Michael Sperber wrote: >> I have a repository I synch over from CVS via tailor, where tailor >> generates a duplicate patch name. How do I fix this? Just changing >> the patch names with a text editor seems to generate a repo I >> subsequently cannot "get". (I don't have the option of manually >> hacking the CVS repository.) > > [...] > You generally only get a collision if you have two patches by the same > author, created at exactly the same time and containing exactly the same > name and description.
Michael Sperber wrote: > OK, so is there any way to trick tailor into not generating the > duplicate patch names? I am cross-posting this to the tailor mailing list (which I access via gmane.comp.version-control.tailor via nntp). I would recommend that you first try to convert the CVS repo with cvs2darcs. cvs2darcs uses cvsps which might be somewhat better at grouping CVS changes into changesets, according to log message and date. As soon as you have CVS and darcs in sync, you can use tailor on a combined CVS/darcs repo. (Yes this works, I did it the same way, only in the other direction). If that fails for some reason, you have to do things manually. Tailor gives you quite informative output and logs everything it does. It should be possible to identify the point in the CVS history right before tailor produces the darcs patch that leads to the failure (the one with the 'identical name' as a previous one. Make tailor stop at this point, e.g. by creating a cvs branch at this point and let tailor use only this branch. Record the next changeset (the problematic one) manually, exactly as tailor would have done, but with a fixed time stamp (e.g. one second later), so that the patches no longer get the same 'name'. Make sure CVS and darcs are in sync, remove the sticky branch tags and let tailor go on with the conversion. Ben _______________________________________________ Tailor mailing list [email protected] http://lists.zooko.com/mailman/listinfo/tailor
