Re: git svn clone clone php/pear/Net_LDAP2 misses tags and branches

From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Oct 25, 2015, 19:25 UTC
Message-ID: <CAOc6etbD24Fxupb8uwp8daZP6BfViR_sN_E91mtnkL_gUgU-Mw@mail.gmail.com>
In-Reply-To: <20151025194851.793f8c64@bogo>

I think there's something "odd" in the way that branch was created. If I take a look at another branch:

$ svn log -v --stop-on-copy
https://svn.php.net/repository/pear/packages/Net_LDAP2/tags/RELEASE_2_0_0RC2
------------------------------------------------------------------------
r255575 | cvs2svn | 2008-03-20 03:37:53 -0600 (Thu, 20 Mar 2008) | 1 line
Changed paths:
  A /pear/packages/Net_LDAP2/tags/RELEASE_2_0_0RC2 (from
/pear/packages/Net_LDAP2/trunk:255574)
  D /pear/packages/Net_LDAP2/tags/RELEASE_2_0_0RC2/LICENSE
  D /pear/packages/Net_LDAP2/tags/RELEASE_2_0_0RC2/tests/ldif_data/unsorted_w50_WIN.ldif

This commit was manufactured by cvs2svn to create tag 'RELEASE_2_0_0RC2'. ------------------------------------------------------------------------

We can see that it looks as if there was a single 'cp' operation for the whole root of the branch from trunk.

And the log for that branch (on git) does show the history coming from trunk.

On the branch you are talking about:

$ svn log -v --stop-on-copy
https://svn.php.net/repository/pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12
------------------------------------------------------------------------
r318475 | beni | 2011-10-27 07:49:00 -0600 (Thu, 27 Oct 2011) | 1 line
Changed paths:
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net/LDAP2
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php
(from /pear/packages/Net_LDAP2/trunk/Net/LDAP2/Entry.php:318466)
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net/LDAP2/Filter.php
(from /pear/packages/Net_LDAP2/trunk/Net/LDAP2/Filter.php:318470)
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net/LDAP2/LDIF.php
(from /pear/packages/Net_LDAP2/trunk/Net/LDAP2/LDIF.php:318466)
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php
(from /pear/packages/Net_LDAP2/trunk/Net/LDAP2/RootDSE.php:318466)
.
.
.
   A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/tests/ldif_data/unsorted_w50.ldif
(from /pear/packages/Net_LDAP2/trunk/tests/ldif_data/unsorted_w50.ldif:318466)
  A /pear/packages/Net_LDAP2/tags/Net_LDAP2-2.0.12/tests/ldif_data/unsorted_w50_WIN.ldif
(from /pear/packages/Net_LDAP2/trunk/tests/ldif_data/unsorted_w50_WIN.ldif:3184
66)

Tagging the 2.0.12 release ------------------------------------------------------------------------

And this tells me that the way the branch was created is not the same as in the other branch (files picked from different revisions?). I guess that's what is making git-svn get "confused".

I guess you could just create a real git tag on a new revision coming from trunk revision 318466, replace the files with the right revisions (the ones that were pulled from another revision) and live with it.

On Sun, Oct 25, 2015 at 12:48 PM, Christian Weiske <cweiske@cweiske.de> wrote:

Show 21 quoted lines

> Hello Christian,
>
>
>> > Did you try with -r revision-number:HEAD?
>>
>> Good idea. I tried it, and now I have the tags and branches:
>
> Unfortunately, the tag branches only have a single commit and have no
> relation to the trunk branch:
>
> $ git log --oneline origin/tags/Net_LDAP2-2.0.12
> 0bc9db1 Tagging the 2.0.12 release
> $
>
> What can I do against that?
>
> --
> Regards/Mit freundlichen Grüßen
> Christian Weiske
>
> -=≡ Geeking around in the name of science since 1982 ≡=-