Re: cvs2git wrongly deletes files when creating branches

On 21/06/10 09:59, Markus Schöpflin wrote:
> But what I'm now seeing in my real repository is, that many commit (only 
> branch creations, AFAICT) don't have parents at all.

Well I'm sure they have one parent, so I guess you mean they don't have
multiple parents. :-)

> For example (conversion with current trunk, note that there is no parent, 
> but a large number of files are cherry picked):
> 
> ---%<---
> Author: cvs2svn <none>  2003-07-24 12:26:44
> Committer: cvs2svn <none>  2003-07-24 12:26:44
> Child:  cd74b51b72960f8e246b6ed0cedb7affa29fffcb
> Branch: XYZ
> Follows:
> Precedes: abc
> 
>      This commit was manufactured by cvs2svn to create branch 'XYZ'.
> 
>      Cherrypick from ... 2002-08-16 13:50:11 UTC
>        <here comes a large list of files>
> --->%---
> 
> Versus (conversion with 2.3.0, 4 parents, no cherry picking:
> 
> ---%<---
> Author: cvs2svn <none>  2003-07-24 12:26:44
> Committer: cvs2svn <none>  2003-07-24 12:26:44
> Parent: b090f22d97b0fc315a4f52e90ceaea5e36cee51e
> Parent: ef2076d0a14465d30c7ba05aae01fbbe5d36f0ba
> Parent: bd558c2f1b645c348e0753fdc2cfe3121132f3ef
> Parent: 7502d887eee8bd3b1f3bfa53d9b8495f794a400c
> Child:  7b5743f5c54578e06afda0cea1f420fc9ac9765a
> Branch: XYZ
> Follows: LIB_1_03, PROGS_0_1_9
> Precedes: abc
> 
>      This commit was manufactured by cvs2svn to create branch 'XYZ'.
> --->%---
> 
> Looking at the whole repository with 'gitk --all' creates an all linear 
> structure with no parallel branches at all, whilst looking at the 
> repository converted with 2.3.0 shows many parallel branches.
> 
> I realize that this may not be very helpful in figuring out what actually 
> is wrong, but maybe the keywords 'cherry picking' and 'no parents for 
> branches' do ring a bell.

This is a completely intentional change that I made, to better represent
the cvs repository in git.

The act of adding some number of files from some other tree state to an
existing branch is not a merge, and should not be represented as such in
git, as it is not only inaccurate, but could disrupt future attempts to
merge changes, as it will have marked some changes as merged when they
are in fact not.

Max.

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

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

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

iEYEARECAAYFAkwfRoMACgkQfFNSmcDyxYCiVACdFoo5Gm3IwIYUYfKvWj69bO/i
CMsAoM9leybvLWqEd2R9kqY2YE8kKICP
=FLYs
-----END PGP SIGNATURE-----