You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Emilian Bold <em...@protonmail.ch.INVALID> on 2018/06/21 10:42:46 UTC
How to import 2nd donation in the Git repository?
Hello,
The 2nd donation is arriving and I wonder how to best import it.
I think it should be a separate branch which we merge into master.
*But* how to we preserve the full history?
The end of the README here https://github.com/apache/incubator-netbeans/blob/master/README.md mentions how to do a 'git replace' to 'stitch' back the history.
I suspect that the 2nd donation should be a new branch with not parents. Then we merge it into master.
Thus, we can do 'git replace' on the 2nd donation branch too.
What do you think?
--emi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Laszlo Kishalmi <la...@gmail.com>.
Well, you might just use the same git repository but into an orphan
branch, or just branch out master and do the import there and the ugly
butchering stuff there.
On 06/21/2018 04:17 AM, Emilian Bold wrote:
> Note that we only release cleared modules, but we are not disallowed of keeping in the same repository modules that are still undergoing IP clearance.
>
> So, I would not create yet another git repository.
>
> I guess that we might need a new temporary git repository while importing in order to create a new branch with no parent commit but after we merge that into our main repository we don't need it anymore. So it's something purely local.
>
> I guess it will look like:
>
> [master] origin1 --> ... ----> Merged 2nd donation commit.
> [2nd_donation] origin2 ---/^
>
> Now I wonder, after the merge... how to access the full repository? I guess we would want to 'git replace' 'origin1' with the corresponding revision for the 2nd donation in netbeans-releases? How will our changes done under Apache show up?
>
> Or can we 'git replace' both 'origin1' and 'origin2' and git is smart enough to figure everything out? That would be pretty nice.
>
> --emi
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On 21 June 2018 2:08 PM, Jan Lahoda <la...@gmail.com> wrote:
>
>> On Thu, Jun 21, 2018 at 12:42 PM, Emilian Bold <
>>
>> emilian.bold@protonmail.ch.invalid> wrote:
>>
>>> Hello,
>>>
>>> The 2nd donation is arriving and I wonder how to best import it.
>>>
>>> I think it should be a separate branch which we merge into master.
>>>
>>> But how to we preserve the full history?
>>>
>>> The end of the README here https://github.com/apache/
>>>
>>> incubator-netbeans/blob/master/README.md mentions how to do a 'git
>>>
>>> replace' to 'stitch' back the history.
>>>
>>> I suspect that the 2nd donation should be a new branch with not parents.
>>>
>>> Then we merge it into master.
>>>
>>> Thus, we can do 'git replace' on the 2nd donation branch too.
>>>
>>> What do you think?
>> Yes, I think we want to be able to join histories (might be easiest to
>>
>> start with an empty repository, place the code there, possibly on a branch,
>>
>> and merge to master).
>>
>> One more aspect to consider is, do we place the 2nd donation code to:
>>
>> -incubator-netbeans, master branch
>>
>> -incubator-netbeans, some other branch
>>
>> -a new copy of incubator-netbeans
>>
>> I don't think there's a strong technical reason for either of these
>>
>> variants (we wouldn't by default build and release the new
>>
>> clusters/modules, until they are reviewed, so these wouldn't/shouldn't be
>>
>> subject to the license checks.)
>>
>> Jan
>>
>>> --emi
>>>
>>> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>>>
>>> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>>
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Emilian Bold <em...@protonmail.ch.INVALID>.
Note that we only release cleared modules, but we are not disallowed of keeping in the same repository modules that are still undergoing IP clearance.
So, I would not create yet another git repository.
I guess that we might need a new temporary git repository while importing in order to create a new branch with no parent commit but after we merge that into our main repository we don't need it anymore. So it's something purely local.
I guess it will look like:
[master] origin1 --> ... ----> Merged 2nd donation commit.
[2nd_donation] origin2 ---/^
Now I wonder, after the merge... how to access the full repository? I guess we would want to 'git replace' 'origin1' with the corresponding revision for the 2nd donation in netbeans-releases? How will our changes done under Apache show up?
Or can we 'git replace' both 'origin1' and 'origin2' and git is smart enough to figure everything out? That would be pretty nice.
--emi
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 21 June 2018 2:08 PM, Jan Lahoda <la...@gmail.com> wrote:
> On Thu, Jun 21, 2018 at 12:42 PM, Emilian Bold <
>
> emilian.bold@protonmail.ch.invalid> wrote:
>
> > Hello,
> >
> > The 2nd donation is arriving and I wonder how to best import it.
> >
> > I think it should be a separate branch which we merge into master.
> >
> > But how to we preserve the full history?
> >
> > The end of the README here https://github.com/apache/
> >
> > incubator-netbeans/blob/master/README.md mentions how to do a 'git
> >
> > replace' to 'stitch' back the history.
> >
> > I suspect that the 2nd donation should be a new branch with not parents.
> >
> > Then we merge it into master.
> >
> > Thus, we can do 'git replace' on the 2nd donation branch too.
> >
> > What do you think?
>
> Yes, I think we want to be able to join histories (might be easiest to
>
> start with an empty repository, place the code there, possibly on a branch,
>
> and merge to master).
>
> One more aspect to consider is, do we place the 2nd donation code to:
>
> -incubator-netbeans, master branch
>
> -incubator-netbeans, some other branch
>
> -a new copy of incubator-netbeans
>
> I don't think there's a strong technical reason for either of these
>
> variants (we wouldn't by default build and release the new
>
> clusters/modules, until they are reviewed, so these wouldn't/shouldn't be
>
> subject to the license checks.)
>
> Jan
>
> > --emi
> >
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> >
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Jan Lahoda <la...@gmail.com>.
On Thu, Jun 21, 2018 at 12:42 PM, Emilian Bold <
emilian.bold@protonmail.ch.invalid> wrote:
> Hello,
>
> The 2nd donation is arriving and I wonder how to best import it.
>
> I think it should be a separate branch which we merge into master.
>
> *But* how to we preserve the full history?
>
> The end of the README here https://github.com/apache/
> incubator-netbeans/blob/master/README.md mentions how to do a 'git
> replace' to 'stitch' back the history.
>
> I suspect that the 2nd donation should be a new branch with not parents.
> Then we merge it into master.
>
> Thus, we can do 'git replace' on the 2nd donation branch too.
>
> What do you think?
>
Yes, I think we want to be able to join histories (might be easiest to
start with an empty repository, place the code there, possibly on a branch,
and merge to master).
One more aspect to consider is, do we place the 2nd donation code to:
-incubator-netbeans, master branch
-incubator-netbeans, some other branch
-a new copy of incubator-netbeans
I don't think there's a strong technical reason for either of these
variants (we wouldn't by default build and release the new
clusters/modules, until they are reviewed, so these wouldn't/shouldn't be
subject to the license checks.)
Jan
>
> --emi
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: How to import 2nd donation in the Git repository?
Posted by Emilian Bold <em...@protonmail.ch.INVALID>.
I don't think we should do any work on the donation2 branch.
It's there just to signify the diverging / merging code and for historical reference.
I would do the IP clearance on the new modules normally, in the master/ branch, after the merge.
--emi
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 21 June 2018 11:23 PM, Jan Lahoda <la...@gmail.com> wrote:
> On Thu, Jun 21, 2018 at 10:00 PM, Emilian Bold <
>
> emilian.bold@protonmail.ch.invalid> wrote:
>
> > No, no, no, I want to keep the existing repository.
> >
> > Actually I just looked and there's 'git checkout --orphan' to create a
> >
> > branch without a parent.
> >
> > So, we create an orphan branch, add the 2nd donation, then merge this
> >
> > branch to master/. Makes sense?
>
> It does to me (the note about new repository was meant as a way to achieve
>
> the goal of having a commit without parent, so any simpler way is good).
>
> We also need to change the license headers at some point, but the tool to
>
> do that shouldn't (I believe) touch files with license headers that don't
>
> match its patterns, so should be safe to apply over the whole repository.
>
> Or it could be done on the branch.
>
> Jan
>
> > --emi
> >
> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> >
> > On 21 June 2018 10:52 PM, Antonio antonio@vieiro.net wrote:
> >
> > > Some thoughts/questions:
> > >
> > > - Do we want another git repository for the 2nd donation? This is,
> > >
> > > what are the advantages/disadvantages of using the same git
> > >
> > > repository?
> > >
> > > - In fact, do we want different repos for different clusters? (PHP /
> > >
> > > JavaEE, etc.?)
> > >
> > > (AFAIK there was a "Experiment: split the main NetBeans repository"
> > >
> > > at
> > >
> > > [1], maybe there's something to learn from that experiment?).
> > >
> > > - Do we want to finish the "Per Cluster Repository Layout" [2] before
> > >
> > > importing?
> > >
> > > Cheers,
> > >
> > > Antonio
> > >
> > > [1]
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/
> > >
> > > Experiment%3A+split+the+main+NetBeans+repository
> > >
> > > [2]
> > >
> > > https://github.com/apache/incubator-netbeans/pull/536
> > >
> > > On 21/06/18 12:42, Emilian Bold wrote:
> > >
> > >
> > > > Hello,
> > > >
> > > > The 2nd donation is arriving and I wonder how to best import it.
> > > >
> > > > I think it should be a separate branch which we merge into master.
> > > >
> > > > But how to we preserve the full history?
> > > >
> > > > The end of the README here https://github.com/apache/
> > > >
> > > > incubator-netbeans/blob/master/README.md mentions how to do a 'git
> > > >
> > > > replace' to 'stitch' back the history.
> > >
> > > > I suspect that the 2nd donation should be a new branch with not
> > > >
> > > > parents. Then we merge it into master.
> > >
> > > > Thus, we can do 'git replace' on the 2nd donation branch too.
> > > >
> > > > What do you think?
> > > >
> > > > --emi
> > > >
> > > > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > > >
> > > > For additional commands, e-mail: dev-help@netbeans.incubator.
> > > >
> > > > apache.org
> > >
> > > > For further information about the NetBeans mailing lists, visit:
> > > >
> > > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> > >
> > > --
> > >
> > > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > >
> > > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> > >
> > > For further information about the NetBeans mailing lists, visit:
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> >
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> >
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Jan Lahoda <la...@gmail.com>.
On Thu, Jun 21, 2018 at 10:00 PM, Emilian Bold <
emilian.bold@protonmail.ch.invalid> wrote:
> No, no, no, I want to keep the existing repository.
>
> Actually I just looked and there's 'git checkout --orphan' to create a
> branch without a parent.
>
> So, we create an orphan branch, add the 2nd donation, then merge this
> branch to master/. Makes sense?
>
It does to me (the note about new repository was meant as a way to achieve
the goal of having a commit without parent, so any simpler way is good).
We also need to change the license headers at some point, but the tool to
do that shouldn't (I believe) touch files with license headers that don't
match its patterns, so should be safe to apply over the whole repository.
Or it could be done on the branch.
Jan
> --emi
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On 21 June 2018 10:52 PM, Antonio <an...@vieiro.net> wrote:
>
> > Some thoughts/questions:
> >
> > - Do we want another git repository for the 2nd donation? This is,
> >
> > what are the advantages/disadvantages of using the same git
> repository?
> >
> > - In fact, do we want different repos for different clusters? (PHP /
> >
> > JavaEE, etc.?)
> >
> > (AFAIK there was a "Experiment: split the main NetBeans repository"
> at
> >
> > [1], maybe there's something to learn from that experiment?).
> >
> > - Do we want to finish the "Per Cluster Repository Layout" [2] before
> >
> > importing?
> >
> > Cheers,
> >
> > Antonio
> >
> > [1]
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/
> Experiment%3A+split+the+main+NetBeans+repository
> >
> > [2]
> >
> > https://github.com/apache/incubator-netbeans/pull/536
> >
> > On 21/06/18 12:42, Emilian Bold wrote:
> >
> >
> > > Hello,
> > >
> > > The 2nd donation is arriving and I wonder how to best import it.
> > >
> > > I think it should be a separate branch which we merge into master.
> > >
> > > But how to we preserve the full history?
> > >
> > > The end of the README here https://github.com/apache/
> incubator-netbeans/blob/master/README.md mentions how to do a 'git
> replace' to 'stitch' back the history.
> > >
> > > I suspect that the 2nd donation should be a new branch with not
> parents. Then we merge it into master.
> > >
> > > Thus, we can do 'git replace' on the 2nd donation branch too.
> > >
> > > What do you think?
> > >
> > > --emi
> > >
> > > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > >
> > > For additional commands, e-mail: dev-help@netbeans.incubator.
> apache.org
> > >
> > > For further information about the NetBeans mailing lists, visit:
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> >
> > --
> >
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> >
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: How to import 2nd donation in the Git repository?
Posted by Matthias Bläsing <mb...@doppel-helix.eu>.
Hi,
Am Donnerstag, den 21.06.2018, 16:00 -0400 schrieb Emilian Bold:
> No, no, no, I want to keep the existing repository.
>
> Actually I just looked and there's 'git checkout --orphan' to create
> a branch without a parent.
>
> So, we create an orphan branch, add the 2nd donation, then merge this
> branch to master/. Makes sense?
I know, that I'm late to the game, but what is reason, not to do this:
- branch out "second_donation_integration"
- import the ZIP (I'll assume, it mostly will contain full modules)
- do the cleanup work (and only that) in that donation branch
- test, that this "hybrid" builds
- some more motivated folks could locally merge master into that
branch an see if it still works
And when done, merge the cleaned-up, relicensed branch into master, at
which point we'll release netbeans 9.X or netbeans 10.
We then have a clear workspace for the licensing, cleanup, make it
build work and have the track record how it happened. And a clear point
(the merge point) where "we" decided, that the right thinks were done.
Before quick hand-work starts, Geertjan has a point, that automatic
mechanisms should come first. We don't gain anything if work, that
automatic license replacement does, is done by humans.
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Antonio <an...@vieiro.net>.
Mmm... we'll reach 783 directories, so no prize! :-)
I think we'll be able to handle that. "git status" will take longer,
though...
Un abrazo,
Antonio
On 22/06/18 22:05, Emilian Bold wrote:
> Do we get some prize after we break the 1000 folder limit? :-)
>
> --emi
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On 22 June 2018 10:09 PM, Antonio <an...@vieiro.net> wrote:
>
>> Hi there,
>>
>> On 21/06/18 22:00, Emilian Bold wrote:
>>
>>> No, no, no, I want to keep the existing repository.
>>>
>>> [...]
>>
>> Wow, that's three no in a row! :-D
>>
>> Well, we all want to keep the existing repository ;-).
>>
>> Now, seriously, why not another repository? After the 2nd donation is
>>
>> merged, will we surpass the thousand top-level directories? That's a big
>>
>> number, isn't it?
>>
>> Or is the goal to continue Jaroslav's clusterization to reduce that number?
>>
>> Thanks,
>>
>> Antonio
>>
>>
>> -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
>>
>> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>>
>> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>>
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Emilian Bold <em...@protonmail.ch.INVALID>.
Do we get some prize after we break the 1000 folder limit? :-)
--emi
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 22 June 2018 10:09 PM, Antonio <an...@vieiro.net> wrote:
> Hi there,
>
> On 21/06/18 22:00, Emilian Bold wrote:
>
> > No, no, no, I want to keep the existing repository.
> >
> > [...]
>
> Wow, that's three no in a row! :-D
>
> Well, we all want to keep the existing repository ;-).
>
> Now, seriously, why not another repository? After the 2nd donation is
>
> merged, will we surpass the thousand top-level directories? That's a big
>
> number, isn't it?
>
> Or is the goal to continue Jaroslav's clusterization to reduce that number?
>
> Thanks,
>
> Antonio
>
>
> -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
>
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
>
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Antonio <an...@vieiro.net>.
Hi there,
On 21/06/18 22:00, Emilian Bold wrote:
> No, no, no, I want to keep the existing repository.
> [...]
Wow, that's three no in a row! :-D
Well, we all want to keep the existing repository ;-).
Now, seriously, why not another repository? After the 2nd donation is
merged, will we surpass the thousand top-level directories? That's a big
number, isn't it?
Or is the goal to continue Jaroslav's clusterization to reduce that number?
Thanks,
Antonio
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Sven Reimers <sv...@gmail.com>.
Branch is ok for me...
-Sven
Geertjan Wielenga <ge...@googlemail.com.invalid> schrieb am
Do., 21. Juni 2018, 22:17:
> Makes sense to me to put it on a branch and then merge the branch once
> we're happy with it.
>
> Gj
>
> On Thu, Jun 21, 2018 at 10:00 PM, Emilian Bold <
> emilian.bold@protonmail.ch.invalid> wrote:
>
> > No, no, no, I want to keep the existing repository.
> >
> > Actually I just looked and there's 'git checkout --orphan' to create a
> > branch without a parent.
> >
> > So, we create an orphan branch, add the 2nd donation, then merge this
> > branch to master/. Makes sense?
> >
> > --emi
> >
> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> >
> > On 21 June 2018 10:52 PM, Antonio <an...@vieiro.net> wrote:
> >
> > > Some thoughts/questions:
> > >
> > > - Do we want another git repository for the 2nd donation? This is,
> > >
> > > what are the advantages/disadvantages of using the same git
> > repository?
> > >
> > > - In fact, do we want different repos for different clusters? (PHP /
> > >
> > > JavaEE, etc.?)
> > >
> > > (AFAIK there was a "Experiment: split the main NetBeans repository"
> > at
> > >
> > > [1], maybe there's something to learn from that experiment?).
> > >
> > > - Do we want to finish the "Per Cluster Repository Layout" [2] before
> > >
> > > importing?
> > >
> > > Cheers,
> > >
> > > Antonio
> > >
> > > [1]
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/
> > Experiment%3A+split+the+main+NetBeans+repository
> > >
> > > [2]
> > >
> > > https://github.com/apache/incubator-netbeans/pull/536
> > >
> > > On 21/06/18 12:42, Emilian Bold wrote:
> > >
> > >
> > > > Hello,
> > > >
> > > > The 2nd donation is arriving and I wonder how to best import it.
> > > >
> > > > I think it should be a separate branch which we merge into master.
> > > >
> > > > But how to we preserve the full history?
> > > >
> > > > The end of the README here https://github.com/apache/
> > incubator-netbeans/blob/master/README.md mentions how to do a 'git
> > replace' to 'stitch' back the history.
> > > >
> > > > I suspect that the 2nd donation should be a new branch with not
> > parents. Then we merge it into master.
> > > >
> > > > Thus, we can do 'git replace' on the 2nd donation branch too.
> > > >
> > > > What do you think?
> > > >
> > > > --emi
> > > >
> > > > To unsubscribe, e-mail:
> dev-unsubscribe@netbeans.incubator.apache.org
> > > >
> > > > For additional commands, e-mail: dev-help@netbeans.incubator.
> > apache.org
> > > >
> > > > For further information about the NetBeans mailing lists, visit:
> > > >
> > > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> > >
> > > --
> > >
> > > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > >
> > > For additional commands, e-mail:
> dev-help@netbeans.incubator.apache.org
> > >
> > > For further information about the NetBeans mailing lists, visit:
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> >
> >
> >
> >
>
Re: How to import 2nd donation in the Git repository?
Posted by Geertjan Wielenga <ge...@googlemail.com.INVALID>.
Makes sense to me to put it on a branch and then merge the branch once
we're happy with it.
Gj
On Thu, Jun 21, 2018 at 10:00 PM, Emilian Bold <
emilian.bold@protonmail.ch.invalid> wrote:
> No, no, no, I want to keep the existing repository.
>
> Actually I just looked and there's 'git checkout --orphan' to create a
> branch without a parent.
>
> So, we create an orphan branch, add the 2nd donation, then merge this
> branch to master/. Makes sense?
>
> --emi
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On 21 June 2018 10:52 PM, Antonio <an...@vieiro.net> wrote:
>
> > Some thoughts/questions:
> >
> > - Do we want another git repository for the 2nd donation? This is,
> >
> > what are the advantages/disadvantages of using the same git
> repository?
> >
> > - In fact, do we want different repos for different clusters? (PHP /
> >
> > JavaEE, etc.?)
> >
> > (AFAIK there was a "Experiment: split the main NetBeans repository"
> at
> >
> > [1], maybe there's something to learn from that experiment?).
> >
> > - Do we want to finish the "Per Cluster Repository Layout" [2] before
> >
> > importing?
> >
> > Cheers,
> >
> > Antonio
> >
> > [1]
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/
> Experiment%3A+split+the+main+NetBeans+repository
> >
> > [2]
> >
> > https://github.com/apache/incubator-netbeans/pull/536
> >
> > On 21/06/18 12:42, Emilian Bold wrote:
> >
> >
> > > Hello,
> > >
> > > The 2nd donation is arriving and I wonder how to best import it.
> > >
> > > I think it should be a separate branch which we merge into master.
> > >
> > > But how to we preserve the full history?
> > >
> > > The end of the README here https://github.com/apache/
> incubator-netbeans/blob/master/README.md mentions how to do a 'git
> replace' to 'stitch' back the history.
> > >
> > > I suspect that the 2nd donation should be a new branch with not
> parents. Then we merge it into master.
> > >
> > > Thus, we can do 'git replace' on the 2nd donation branch too.
> > >
> > > What do you think?
> > >
> > > --emi
> > >
> > > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> > >
> > > For additional commands, e-mail: dev-help@netbeans.incubator.
> apache.org
> > >
> > > For further information about the NetBeans mailing lists, visit:
> > >
> > > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> >
> > --
> >
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> >
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: How to import 2nd donation in the Git repository?
Posted by Emilian Bold <em...@protonmail.ch.INVALID>.
No, no, no, I want to keep the existing repository.
Actually I just looked and there's 'git checkout --orphan' to create a branch without a parent.
So, we create an orphan branch, add the 2nd donation, then merge this branch to master/. Makes sense?
--emi
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On 21 June 2018 10:52 PM, Antonio <an...@vieiro.net> wrote:
> Some thoughts/questions:
>
> - Do we want another git repository for the 2nd donation? This is,
>
> what are the advantages/disadvantages of using the same git repository?
>
> - In fact, do we want different repos for different clusters? (PHP /
>
> JavaEE, etc.?)
>
> (AFAIK there was a "Experiment: split the main NetBeans repository" at
>
> [1], maybe there's something to learn from that experiment?).
>
> - Do we want to finish the "Per Cluster Repository Layout" [2] before
>
> importing?
>
> Cheers,
>
> Antonio
>
> [1]
>
> https://cwiki.apache.org/confluence/display/NETBEANS/Experiment%3A+split+the+main+NetBeans+repository
>
> [2]
>
> https://github.com/apache/incubator-netbeans/pull/536
>
> On 21/06/18 12:42, Emilian Bold wrote:
>
>
> > Hello,
> >
> > The 2nd donation is arriving and I wonder how to best import it.
> >
> > I think it should be a separate branch which we merge into master.
> >
> > But how to we preserve the full history?
> >
> > The end of the README here https://github.com/apache/incubator-netbeans/blob/master/README.md mentions how to do a 'git replace' to 'stitch' back the history.
> >
> > I suspect that the 2nd donation should be a new branch with not parents. Then we merge it into master.
> >
> > Thus, we can do 'git replace' on the 2nd donation branch too.
> >
> > What do you think?
> >
> > --emi
> >
> > To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> >
> > For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
> >
> > For further information about the NetBeans mailing lists, visit:
> >
> > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
> --
>
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
>
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
>
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: How to import 2nd donation in the Git repository?
Posted by Antonio <an...@vieiro.net>.
Some thoughts/questions:
- Do we want _another_ git repository for the 2nd donation? This is,
what are the advantages/disadvantages of using the same git repository?
- In fact, do we want different repos for different clusters? (PHP /
JavaEE, etc.?)
(AFAIK there was a "Experiment: split the main NetBeans repository" at
[1], maybe there's something to learn from that experiment?).
- Do we want to finish the "Per Cluster Repository Layout" [2] before
importing?
Cheers,
Antonio
[1]
https://cwiki.apache.org/confluence/display/NETBEANS/Experiment%3A+split+the+main+NetBeans+repository
[2]
https://github.com/apache/incubator-netbeans/pull/536
On 21/06/18 12:42, Emilian Bold wrote:
> Hello,
>
> The 2nd donation is arriving and I wonder how to best import it.
>
> I think it should be a separate branch which we merge into master.
>
> *But* how to we preserve the full history?
>
> The end of the README here https://github.com/apache/incubator-netbeans/blob/master/README.md mentions how to do a 'git replace' to 'stitch' back the history.
>
> I suspect that the 2nd donation should be a new branch with not parents. Then we merge it into master.
>
> Thus, we can do 'git replace' on the 2nd donation branch too.
>
> What do you think?
>
> --emi
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
> For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.incubator.apache.org
For additional commands, e-mail: dev-help@netbeans.incubator.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists