==== Trimming the [[Git]] History ====

==== Trimming the [[Git]] History ====

Just before last Christmas break [[I]] decided to tackle the problem. [[Git]] is known to support shallow copies: ```git clone --depth=1 url``` - could we make such shallow copy and host that at [[Apache]] while keeping the ''deep'' copy with all history (as created by Emilian) and use it for day to day development? Can changesets created on top of the shallow copy be easily pulled to deep copy and vice versa?

Just before last Christmas break [[I]] decided to tackle the problem. [[Git]] is known to support shallow copies: '''git clone --depth=1 url''' - could we make such shallow copy and host that at [[Apache]] while keeping the ''deep'' copy with all history (as created by Emilian) and use it for day to day development? Can changesets created on top of the shallow copy be easily pulled to deep copy and vice versa?

Short answer: '''No'''.

Short answer: '''No'''.

[[Git]] has some security features that prevent one to put shallow copy of ```depth=1``` into an empty repository. But [[I]] hadn't given up and found [http://stackoverflow.com/questions/11375070/pushing-to-github-after-a-shallow-clone small hint]: looks like [[Git]]'s ```replace``` command could do the trick.

[[Git]] has some security features that prevent one to put shallow copy of '''depth=1''' into an empty repository. But [[I]] hadn't given up and found [http://stackoverflow.com/questions/11375070/pushing-to-github-after-a-shallow-clone small hint]: looks like [[Git]]'s '''replace''' command could do the trick.

Thus we have useful [[Git]] repositories by Emilian that we want to use for our work and official repositories hosted at [[Apache]]. Of course one can have both repositories next to each other locally and work in one and commit to the other, but such work requires significant [[doublethink]] and will be errorprone.

Thus we have useful [[Git]] repositories by Emilian that we want to use for our work and official repositories hosted at [[Apache]]. Of course one can have both repositories next to each other locally and work in one and commit to the other, but such work requires significant [[doublethink]] and will be errorprone.

In autumn 2016 [[Oracle]] announced that it wants to donate [[NetBeans]] to [[wikipedia::Apache_Software_Foundation|Apache]] foundation. It is January 2017 and we are still donating. Right now there is a review of [[NetBeans]] sources in progress. Some repositories are reviewed (for example [http://hg.netbeans.org/html4j html4j] [[Mercurial]] repository) and a branch '''donation_review''' has been created there. The process isn't fast, but we are getting in there.

In autumn 2016 [[Oracle]] announced that it wants to donate [[NetBeans]] to [[wikipedia::Apache_Software_Foundation|Apache]] foundation. It is January 2017 and we are still donating. Right now there is a review of [[NetBeans]] sources in progress. Some repositories are reviewed (for example [http://hg.netbeans.org/html4j html4j] [[Mercurial]] repository) and a branch '''donation_review''' has been created there. The process isn't fast, but we are getting in there.

==== Conversion to [[Git]] ====

== Conversion to [[Git]] ==

[[Apache]] is using [[Git]] and that means we shall convert our [[Hg]] repositories to [[Git]] ones. Luckily, this is where the power of community shows! Emilian Bold, long time NetBeans community member, decided to do such conversion. As such we have 1:1 mapping between [http://hg.netbeans.org/release NetBeans Releases Repository] and its [https://github.com/emilianbold/netbeans-releases Git version]. Thanks Emilian! As the review isn't finished yet, and we are still using the [[Hg]] repository for daily development - Emilian synchronizes the repositories daily. All seems to work.

[[Apache]] is using [[Git]] and that means we shall convert our [[Hg]] repositories to [[Git]] ones. Luckily, this is where the power of community shows! Emilian Bold, long time NetBeans community member, decided to do such conversion. As such we have 1:1 mapping between [http://hg.netbeans.org/release NetBeans Releases Repository] and its [https://github.com/emilianbold/netbeans-releases Git version]. Thanks Emilian! As the review isn't finished yet, and we are still using the [[Hg]] repository for daily development - Emilian synchronizes the repositories daily. All seems to work.

#REDIRECT [[wikipedia::Apache_Software_Foundation]]

In autumn 2016 [[Oracle]] announced that it wants to donate [[NetBeans]] to [[wikipedia::Apache_Software_Foundation|Apache]] foundation. It is January 2017 and we are still donating. Right now there is a review of [[NetBeans]] sources in progress. Some repositories are reviewed (for example [http://hg.netbeans.org/html4j html4j] [[Mercurial]] repository) and a branch '''donation_review''' has been created there. The process isn't fast, but we are getting in there.

 

 

[[Apache]] is using [[Git]] and that means we shall convert our [[Hg]] repositories to [[Git]] ones. Luckily, this is where the power of community shows! Emilian Bold, long time NetBeans community member, decided to do such conversion. As such we have 1:1 mapping between [http://hg.netbeans.org/release NetBeans Releases Repository] and its [https://github.com/emilianbold/netbeans-releases Git version]. Thanks Emilian! As the review isn't finished yet, and we are still using the [[Hg]] repository for daily development - Emilian synchronizes the repositories daily. All seems to work.