You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by Keith W <ke...@gmail.com> on 2015/04/07 13:13:09 UTC

Re: Trunk re-organisation

On 30 March 2015 at 17:58, Keith W <ke...@gmail.com> wrote:

>
>
> Its possibly worth [someone other than me, since I'm meant to be on
>> vacation just now :P] discussing with infra before we proceed with svn
>> changes, to find out what they think in case it should impact any
>> subsequent migrations to Git that were to be made.
>>
>
> I have pinged just such a mail onto the infra @ list.
>
>

You may have seen that I got an initial positive answer from Infra (Jake)
to my question "after the trunk re-org, if we were later to move some
components to  git, would history be retained?".  However, I later
experimented with asfgit-clone-svn.py and a mini svn repo (created to look
like ours will), and found that history was retain only as far as the move
and on earlier.  You can see the transcript of the commands on the infra
thread.  I found a couple of threads on stack overflow [1] where people had
reported similar findings using the (raw git tooling).   I posted my
findings to Jake and I am awaiting a response.  I don't have a very deep
understanding of git so it is very possible I have done something wrong.

However, from a java tree perspective, I see no point further in delaying
the svn reorganisation.  We already know svn move is the correct technique
to retain history _within_ svn.  Even if it turns out migrating to git
can't retain a history where there has been an svn mv involving a trunk
organisation, we still would not want to migrate the java tree to git in
its current form.  I agree with Rob's earlier comments that we will want to
make further restructuring within java [separation of broker from what will
be legacy client) before we consider a move to Git.  If history is not
migrated it will be a pain, but not insurmountable. I have raised a Jira to
cover the Java tree re-org [2] which I intend to action later this week.


[1]
http://stackoverflow.com/questions/12938189/how-do-i-keep-svn-history-in-git-when-trunk-has-moved
[2] https://issues.apache.org/jira/browse/QPID-6481

Re: Trunk re-organisation

Posted by Oleksandr Rudyy <or...@gmail.com>.
Hi,

I moved java source tree into top level [1]
Additionally, I raised an infra request to create git mirror for java
source tree [2].

Now, we need to decide how to change site generation scripts in order to
publish java release artifacts like documentation, java related site pages,
etc.

Kind Regards,
Alex

[1] https://svn.apache.org/repos/asf/qpid/java/trunk
[2] https://issues.apache.org/jira/servicedesk/customer/portal/1/INFRA-9446

Re: Trunk re-organisation

Posted by Robbie Gemmell <ro...@gmail.com>.
On 15 April 2015 at 10:34, Oleksandr Rudyy <or...@gmail.com> wrote:
>>
>> One thing that just occurred to me is that by moving the java dir its
>> contents will no longer be available via the git mirrors as it
>> currently is, so it would need to be requested for new mirrors at
>> git.apache.org and GitHub.
>
>
> Hi Robbie,
> I am going to request a new git mirror for java source tree as soon as I
> perform the move.
> It seems I need to raise a new infra request "SVN to GIT MIrroring" at [1].
> Is anything else needs to be done for that? How did you request git mirror
> for new JMS client?
>
> Kind Regards,
> Alex
>
>
> [1] https://issues.apache.org/jira/servicedesk/customer/portal/1/create/17

I requested the mirrors by raising JIRAs with Infra, but the
servicedesk seems to be the new way.

I imagine you will have to make a separate request for a GitHub
mirror, they tend to be considered separately and sometimes handled by
different folks.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org


Re: Trunk re-organisation

Posted by Oleksandr Rudyy <or...@gmail.com>.
>
> One thing that just occurred to me is that by moving the java dir its
> contents will no longer be available via the git mirrors as it
> currently is, so it would need to be requested for new mirrors at
> git.apache.org and GitHub.


Hi Robbie,
I am going to request a new git mirror for java source tree as soon as I
perform the move.
It seems I need to raise a new infra request "SVN to GIT MIrroring" at [1].
Is anything else needs to be done for that? How did you request git mirror
for new JMS client?

Kind Regards,
Alex


[1] https://issues.apache.org/jira/servicedesk/customer/portal/1/create/17

Re: Trunk re-organisation

Posted by Robbie Gemmell <ro...@gmail.com>.
On 7 April 2015 at 12:13, Keith W <ke...@gmail.com> wrote:
> On 30 March 2015 at 17:58, Keith W <ke...@gmail.com> wrote:
>
>>
>>
>> Its possibly worth [someone other than me, since I'm meant to be on
>>> vacation just now :P] discussing with infra before we proceed with svn
>>> changes, to find out what they think in case it should impact any
>>> subsequent migrations to Git that were to be made.
>>>
>>
>> I have pinged just such a mail onto the infra @ list.
>>
>>
>
> You may have seen that I got an initial positive answer from Infra (Jake)
> to my question "after the trunk re-org, if we were later to move some
> components to  git, would history be retained?".  However, I later
> experimented with asfgit-clone-svn.py and a mini svn repo (created to look
> like ours will), and found that history was retain only as far as the move
> and on earlier.  You can see the transcript of the commands on the infra
> thread.  I found a couple of threads on stack overflow [1] where people had
> reported similar findings using the (raw git tooling).   I posted my
> findings to Jake and I am awaiting a response.

Did you get any?

>  I don't have a very deep
> understanding of git so it is very possible I have done something wrong.
>
> However, from a java tree perspective, I see no point further in delaying
> the svn reorganisation.  We already know svn move is the correct technique
> to retain history _within_ svn.  Even if it turns out migrating to git
> can't retain a history where there has been an svn mv involving a trunk
> organisation, we still would not want to migrate the java tree to git in
> its current form.

One thing that just occurred to me is that by moving the java dir its
contents will no longer be available via the git mirrors as it
currently is, so it would need to be requested for new mirrors at
git.apache.org and GitHub.

> I agree with Rob's earlier comments that we will want to
> make further restructuring within java [separation of broker from what will
> be legacy client) before we consider a move to Git.  If history is not
> migrated it will be a pain, but not insurmountable. I have raised a Jira to
> cover the Java tree re-org [2] which I intend to action later this week.
>
>
> [1]
> http://stackoverflow.com/questions/12938189/how-do-i-keep-svn-history-in-git-when-trunk-has-moved
> [2] https://issues.apache.org/jira/browse/QPID-6481

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org


Re: Trunk re-organisation

Posted by Oleksandr Rudyy <or...@gmail.com>.
Hi,
I am going to proceed with re-organizing of java source tree tomorrow.
I created a page with possible steps to follow at [1].

Please, let me know if the sources move can impact anyone and it needs to
be delayed.

Kind Regards,
Alex

[1]
https://cwiki.apache.org/confluence/display/qpid/Move+java+source+tree+under+qpid+root