http://wiki.apidesign.org/index.php?action=history&feed=atom&title=Apache 2026-04-03T18:39:51Z Revision history for this page on the wiki MediaWiki 1.12.0rc1 http://wiki.apidesign.org/index.php?title=Apache&diff=9041&oldid=prev 2017-01-13T15:41:51Z

<p><span class="autocomment">Trimming the Git History</span></p> <table style="background-color: white; color:black;"> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr> <td colspan='2' style="background-color: white; color:black;">←Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 15:41, 13 January 2017</td> </tr> <tr><td colspan="2" class="diff-lineno">Line 17:</td> <td colspan="2" class="diff-lineno">Line 17:</td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>==== Trimming the [[Git]] History ====</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>==== Trimming the [[Git]] History ====</div></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>Just before last Christmas break [[I]] decided to tackle the problem. [[Git]] is known to support shallow copies: <del style="color: red; font-weight: bold; text-decoration: none;">```</del>git clone --depth=1 url<del style="color: red; font-weight: bold; text-decoration: none;">``` </del>- 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? </div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>Just before last Christmas break [[I]] decided to tackle the problem. [[Git]] is known to support shallow copies: <ins style="color: red; font-weight: bold; text-decoration: none;">'''</ins>git clone --depth=1 url<ins style="color: red; font-weight: bold; text-decoration: none;">''' </ins>- 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? </div></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>Short answer: '''No'''.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>Short answer: '''No'''.</div></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>[[Git]] has some security features that prevent one to put shallow copy of <del style="color: red; font-weight: bold; text-decoration: none;">```</del>depth=1<del style="color: red; font-weight: bold; text-decoration: none;">``` </del>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 <del style="color: red; font-weight: bold; text-decoration: none;">```</del>replace<del style="color: red; font-weight: bold; text-decoration: none;">``` </del>command could do the trick.</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>[[Git]] has some security features that prevent one to put shallow copy of <ins style="color: red; font-weight: bold; text-decoration: none;">'''</ins>depth=1<ins style="color: red; font-weight: bold; text-decoration: none;">''' </ins>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 <ins style="color: red; font-weight: bold; text-decoration: none;">'''</ins>replace<ins style="color: red; font-weight: bold; text-decoration: none;">''' </ins>command could do the trick.</div></td></tr> </table>

JaroslavTulach http://wiki.apidesign.org/index.php?title=Apache&diff=9040&oldid=prev 2017-01-13T15:41:18Z

<p><span class="autocomment">NetBeans Git Repositories at Apache</span></p> <table style="background-color: white; color:black;"> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr> <td colspan='2' style="background-color: white; color:black;">←Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 15:41, 13 January 2017</td> </tr> <tr><td colspan="2" class="diff-lineno">Line 14:</td> <td colspan="2" class="diff-lineno">Line 14:</td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>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.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>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.</div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">==== Trimming the [[Git]] History ====</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">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? </ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">Short answer: '''No'''.</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">[[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.</ins></div></td></tr> </table>

JaroslavTulach http://wiki.apidesign.org/index.php?title=Apache&diff=9039&oldid=prev 2017-01-13T15:29:09Z

<p></p> <table style="background-color: white; color:black;"> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr> <td colspan='2' style="background-color: white; color:black;">←Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 15:29, 13 January 2017</td> </tr> <tr><td colspan="2" class="diff-lineno">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>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.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>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.</div></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;">==</del>== Conversion to [[Git]] <del style="color: red; font-weight: bold; text-decoration: none;">==</del>==</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>== Conversion to [[Git]] ==</div></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[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.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[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.</div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">Emilian was so kind that he also converted the [[Html4Java]] [[Hg]] repository [http://hg.netbeans.org/html4j html4j] to [https://github.com/emilianbold/netbeans-html4j Git one]. His work was so excellent that [[I]] decided to close all development in the old [[Hg]] repository and move it to [[Git]]. As such all changes for [[Html4Java]] are now happening at [https://github.com/jtulach/html-java-api] - until we find more suitable place.</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">==== [[NetBeans]] [[Git]] Repositories at [[Apache]] ====</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">Will all these repositories be hosted by [[Apache]]? I don't know, but [[I]] doubt. The [[Oracle]] review of the code reveals some problems (for example [http://hg.netbeans.org/html4j/rev/929563230c07 here]) and they need to be fixed. [[Oracle]] can then donate only the fixed code - e.g. not with the whole history.</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">However having source code without history is the best way to kill a project. We have to have the history. We have to have to do '''git blame''' and get reasonable results, otherwise the project becomes unmaintainable. Will [[Apache]] take the Emilian [[Git]] repositories? With the history? Or will [[Apache]] insist on starting from scratch? I am afraid, the latter is closer to reality.</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">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.</ins></div></td></tr> </table>

JaroslavTulach http://wiki.apidesign.org/index.php?title=Apache&diff=9038&oldid=prev 2017-01-13T15:17:59Z

<p></p> <table style="background-color: white; color:black;"> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr> <td colspan='2' style="background-color: white; color:black;">←Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 15:17, 13 January 2017</td> </tr> <tr><td colspan="2" class="diff-lineno">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;">#REDIRECT </del>[[wikipedia::Apache_Software_Foundation]]</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">In autumn 2016 [[Oracle]] announced that it wants to donate [[NetBeans]] to </ins>[[wikipedia::Apache_Software_Foundation<ins style="color: red; font-weight: bold; text-decoration: none;">|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.</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>&#160;</div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">==== Conversion to [[Git]] ====</ins></div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>&#160;</div></td></tr> <tr><td colspan="2">&nbsp;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">[[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</ins>]] <ins style="color: red; font-weight: bold; text-decoration: none;">repository for daily development - Emilian synchronizes the repositories daily. All seems to work.</ins></div></td></tr> </table>

JaroslavTulach http://wiki.apidesign.org/index.php?title=Apache&diff=2861&oldid=prev 2009-09-13T19:21:08Z

<p>Redirecting to <a href="http://en.wikipedia.org/wiki/Apache_Software_Foundation" class="extiw" title="wikipedia:Apache_Software_Foundation">wikipedia:Apache Software Foundation</a></p> <p><b>New page</b></p><div>#REDIRECT [[wikipedia::Apache_Software_Foundation]]</div>

JaroslavTulach