Ooo Hg to Apache Extras (was Re:OOO340 to svn)

["Dennis E. Hamilton" <de...@acm.org>]

I am assuming that the Mercurial repository(ies) [my mind can't grasp all of those Child Work Spaces) will be as-is and therefore covered by whatever licenses and notices that are already affixed.  [I am assuming this is analogous with LibreOffice acquiring the LGPL-licensed OO.o code base for its own purposes.]

The SVN will be adjusted with LICENSE, NOTICE, and headers as appropriate to the situation for that code and whatever can happen when an SGA is relied upon.

Another problem becomes determining what can be cherry-picked safely from the Apache Extras as also-licensed to Apache and what cannot.  I suppose it depends on the way the (updated) SGA is written.

I am going to operate from the assumption that it is not appropriate to cherry-pick the OOo Apache Extra into the Apache SVN in any manner, although that code base can certainly be used consistent with the license already applied to it.

Does anyone recognize a problem with that (i.e., something critical would be unavailable for use by Apache OpenOffice.org)?  

 - Dennis, reluctantly preparing to live with SVN, VSS, git, and hg altogether

PS: Does this mean that the OpenOffice.org bugzilla could also go to the ooo Apache Extra?  That might be more important in the short run, while we figure out what we want to do with that base and also determining what of it applies to Apache OpenOffice.org and what doesn't.

-----Original Message-----
From: Greg Stein [mailto:gstein@gmail.com] 
Sent: Thursday, July 28, 2011 04:56
To: ooo-dev@incubator.apache.org
Subject: Re: OOO340 to svn

On Jul 28, 2011 3:38 AM, "Eike Rathke" <oo...@erack.de> wrote:
[ ... ]
> Actually I don't get why we still waste time discussing this, it seems
> to have turned out that retaining full history in hg->svn is not
> possible without manual intervention and lot of work, so use the next
> feasible solution.

We talk about it because we are optimistic, and we are hopeful.

I have created "ooo" on apache-extras, but would like to give a full 72 hour
discussion to see what support looks like. This does mean that we will only
have "tip" in svn. That needs some thought and acceptance before we do that.

Cheers,
-g

Re: Ooo Hg to Apache Extras (was Re:OOO340 to svn)

[Mathias Bauer <Ma...@gmx.net>]

On 28.07.2011 22:43, Thorsten Behrens wrote:
> Dennis E. Hamilton wrote:
>> I am going to operate from the assumption that it is not
>> appropriate to cherry-pick the OOo Apache Extra into the Apache
>> SVN in any manner, although that code base can certainly be used
>> consistent with the license already applied to it.
>>
>> Does anyone recognize a problem with that (i.e., something
>> critical would be unavailable for use by Apache OpenOffice.org)?
>>
> Quite. As mentioned before, as yet un-merged CWS like gnumake4 or
> aw080 represent significant amount of work (order of magnitude: man
> years, I'd guess). Mathias suggested to extract patches out of
> those, and have these patches covered by an extended source code
> grant. That should nicely expedite legal review.
>
> Cheers,
>
> -- Thorsten

According to advice given on this list, it is enough to have all files 
listed in the software grant statement. For this purpose it would be 
enough to have all new files from all cws (new means: not in OOO340m1) 
listed. I already created such a list and sent it to Andrew Rist for 
further processing.

While we are talking about patches: there might be a way to create 
change sets (history) from the cws hg repos.

First, update the cws repo to the OOO340 trunk repository (pull/merge). 
Then create a list of "outgoing" change sets (against OOO340 trunk) for 
the cws and create patches for all of them by using "hg diff -c" (could 
be done by a script). Then remove all patches representing merge change 
sets (at least those with a suitable comment could be removed by a 
script also), create an svn branch, apply the patches one after another 
and commit them. This will create conflicts or adjustment at times, but 
they will be carried out in svn. As the cws need review before they can 
be intergrated, this work can be a part of the review process and so 
perhaps the additional work is bearable.

Regards,
Mathias

Re: Ooo Hg to Apache Extras (was Re:OOO340 to svn)

[Thorsten Behrens <th...@documentfoundation.org>]

Dennis E. Hamilton wrote:
> I am going to operate from the assumption that it is not
> appropriate to cherry-pick the OOo Apache Extra into the Apache
> SVN in any manner, although that code base can certainly be used
> consistent with the license already applied to it.
> 
> Does anyone recognize a problem with that (i.e., something
> critical would be unavailable for use by Apache OpenOffice.org)?  
> 
Quite. As mentioned before, as yet un-merged CWS like gnumake4 or
aw080 represent significant amount of work (order of magnitude: man
years, I'd guess). Mathias suggested to extract patches out of
those, and have these patches covered by an extended source code
grant. That should nicely expedite legal review.

Cheers,

-- Thorsten