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 <[email protected]> wrote:
On Thu, Jun 21, 2018 at 12:42 PM, Emilian Bold <
[email protected]> 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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
