Re: cvs2git wrongly deletes files when creating branches

On 17/06/10 11:54, Markus Schöpflin wrote:
> Am 17.06.2010 00:42, schrieb Max Bowsher:
> 
>> I have just committed a change to trunk which I hope should fix this issue.
> 
> Hmm, now things seem really odd.
> 
> I tested it with the reproducer I provided earlier, and the results are 
> quite surprising. For your reference, I have attached the output of 'git 
> log --name-status --all' to this message. One shows the result from 
> converting it with 2.3.0, the other with current SVN.
> 
> - As you can see, the symbol00000 branch is now created between log1 and 
> log2, but it should have been created between log5 and log8.

The conversion is correct, the only problem is that cvs2git's commit
messages are misleading when a branch is created in multiple stages.

symbol00000 sprouts correctly from log 5 (and there is no visible commit
for this because it optimized out to a simple reference update), but
there is later a commit which performs the second stage of creating it
by adding file002 after log 1.

> - Also file002 is missing from symbol00001.

That is correct. That's what the source CVS repository says.

> - Next, a number of manufactured commits for branch creation are no longer 
> present with the SVN version.

In git, the act of creating a branch is just a reference update, and
does not involve a commit. The trunk version of cvs2git mirrors this and
does not manufacture a branch creation commit unless it actually needs
to enact a change to the tree as part of branch creation.


So, in summary, what I think we ought to do is provide different
generated commit messages for branch creation depending on whether they
are for initial branch creation, or to splice additional files into a
partially created branch.

Max.

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

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkwbwaIACgkQfFNSmcDyxYCaGwCgs0H4BTeEJTuzJVmllGbNB+vp
G04An24jCUjm9KoLSjE6xXw3EEVmXQoy
=6ozE
-----END PGP SIGNATURE-----