Re: Further debugging of iterative imports

On 12/14/2010 08:12 PM, Alex Bennee wrote:
> Further to my previous emails found another failure case that
> causes diverging history. It's probably clearest if I just show the
> import log:
> [...]

Again, your two-column diffs have been munged by your mailer and are
almost impossible to read.  Please provide the diffs as a text
attachment or in some other format.

> The right hand side is the second import and as you can see from the
> log two files that were in their own commit have this time been
> wrapped up into another commit.
> 
> Looking at the CVS log entry for that redundancy.c I can see the
> following: [...]
> 
> The log for coswd/coswdtrap/coswdtrap.c is totally different: [...]

That fact that the log messages are different is irrelevant, because
what cvs2svn is combining into one commit are not the r1.1 versions of
each file, but the act of adding the two files to branch
'vectastar-3-3-20-red-e1-opt-branch'.  CVS does not record any metadata
when a file is added to a branch, so cvs2svn tries to group them
together whenever there is not another constraint that prevents it from
doing so.

> Can anyone offer a pointer to where cvs2svn makes the decision on
> creating these manufactured commits and how it decides which ones
> match?

See doc/design-notes.txt and doc/symbol-notes.txt in the source tree.
Either there is some source of indeterminacy in the heuristics that are
being used to select changesets (which might be fixable with minimal
work), or you are experiencing a case where later changes to the CVS
repository are causing the heuristics to make different choices during
the second conversion compared to the first one (only fixable with
massive work).

Michael

-- 
Michael Haggerty
[email protected]
http://softwareswirl.blogspot.com/

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2690739

To unsubscribe from this discussion, e-mail: [[email protected]].