Re: cvs2git wrongly deletes files when creating branches

Am 29.05.2010 07:26, schrieb Michael Haggerty:

[...]

> symbol00000 is
>
>      file001:1.1.1.1.30.1.2.1.2
>      file002:1.2.2
>
> Here are the relevant commits in the two files:
>
>      file001:1.1.1.1.30.1.2.1     2004.03.11 "log 5"
>      file001:1.1.1.1.30.1.2.1.2.1 2004.07.19 "log 8"
>      ...
>      file001:1.1.1.1.30.1.2.1.2.5 2005.05.23 "log 12"
>      file001:1.1.1.1.30.1.2.1.2.6 2010.02.19 "log 13"
>
>      file002:1.2                  2005.12.16 "log 1"
>      file002:1.2.2.1              2006.11.07 "log 2"
>

[...]

> 1. The symbol00000 branch should initially be created between "log 5"
> and "log 8" by copying file001 from the symbol00001 branch.  (That's the
> only file on symbol00001 at the time, so there is no diff involved.)

[...]

> As far as I can see, this is exactly what the 2.3.0 version of cvs2git
> does.  (The strange commit "file file002 was initially added on branch
> symbol00004" is misleading because there is no symbol00004; presumably
> it was deleted by shrink_test_case.py.)  Aside from the fact that the
> 2.3.0 output is a bit wordy, I don't see any problem with it.

[...]

What confuses me in the 2.3.0 result is that the branch for symbol00000 is 
created two times:

---%<---
commit aa237cdc7ee42430ded88182f9ea2b399b94cc6a
Merge: 3f9292c 9463ebc
Author: cvs2svn <[email protected]>
Date:   Fri Dec 16 12:47:31 2005 +0000

     This commit was manufactured by cvs2svn to create branch 'symbol00000'.

commit d24a151c3e39c42872ec20bdc3b1867e2f2a76da
Author: cvs2svn <[email protected]>
Date:   Thu Mar 11 14:23:43 2004 +0000

     This commit was manufactured by cvs2svn to create branch 'symbol00000'.
--->%---

What I would have expected is that a branch is created (when file001 was 
branched) and then later file002 just gets copied to that branch.

But maybe this is what is happening and I'm just not interpreting the 
output of git log correctly?

Regards,
Markus

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

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