[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH]: Revised cvs2svn.py patches

From: Greg Stein <gstein_at_lyra.org>
Date: 2002-02-12 08:26:08 CET

On Tue, Feb 12, 2002 at 12:59:29AM -0500, Daniel Berlin wrote:
> You need a seperator in between log and author before digesting them.
> Otherwise, things like spelling mistakes and accidental typos in logs, as
> well as the usernames you've used in a cvs repository, could become
> significant.

Fair enough. I can add a NUL character in between them. While it may
technically be possible (not positive) for that to appear in either the
author or the log, it definitely shouldn't exist in practice.

> Just throw a separator in between (log + author), and fixing commit
> grouping should make the problem go away.

Yup. Basically, I'm going to add some code to scan for overlapping commits.
Things where the start and end of one commit overlap with another. If that
happens, then the two commits need to be examined for conflicts (both
committing the same file). Another problem (as I've already seen) is a
single commit containing the same file, multiple times.

(I also have a repository with two, apparently overlapping, commits; but I
 believe this is mostly some weirdness in the repos, rather than a true
 overlap; but I'm sure that I can find two overlapping commits "out there")


Greg Stein, http://www.lyra.org/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:06 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.