>> Geertjan Wielenga <[email protected]>: 09.09.17 @ 12:29 << > Thinking with my Apache hat on, we need to establish what the status is of > Emilian's GitHub repo.
One of the commits in Emilian repositories (for HTML/Java or NetBeans itself) shall exactly match the initial commit into Apache. The status has been described in the Git steps bellow: follow them and you get the whole history of NetBeans code - e.g. the Emilian repositories are essential helpful tools. The important thing is to prevent commits from pre-Apache days to sneak into Apache repository. In HTML/Java repository bottom most unwanted commit is: commit ae545b52dccd26160756b00c11fdfa93814f3c3e Author: Jaroslav Tulach <[email protected]> Date: Fri Apr 19 10:01:02 2013 +0200 Initial version of the JSON model APIs. this commit shall never get into the Apache repo. Otherwise it would be a sign that somebody merged pre-Apache work/history into Apache repo. Infra knowledgeable guys, is there a way to add a git hook to guarantee that? Another JIRA issue for INFRA? -jt > Could it be considered as a fork of pre-Apache > NetBeans that we're using as a reference point for purposes of having a > history, since the history was not part of the donation? > > Or we could consider it as an external tool, just like any external tool > that one might use, e.g., if I'm using Vim or NetBeans or Notepad to > develop the Apache NetBeans code, that's irrelevant to Apache. Apache > doesn't care what editor one uses. In the same way, Emilian's GitHub repo > could be seen as providing an external tool for seeing the history of the > code we work on. > > It clearly had no official status and is simply a helpful tool when working > on Apache NetBeans. > > In the spirit of discussing everything in terms of its status and to make > sure all decisions are made out in the open, > > Gj > > On Sat, Sep 9, 2017 at 9:51 AM, Jaroslav Tulach <[email protected]> > wrote: > > Hi. > > As you may noticed the NetBeans source code donation is just a ZIP file - > > e.g. > > it has no history. However history of the project is important source of > > information, and it would be bad if we lost it. Thanks to Emilian, we > > still > > have it. > > > > Here is how you can create a combined repository with full history for > > HTML/ > > Java API: > > > > $ git clone > > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_in > > cubator-2Dnetbeans-2Dhtml4j&d=DwIBaQ&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY > > 057SbK10&r=tnLz5-vaI8x9g_xBBlFGf_ldS0-TN1M3i9fMP1FPWgk&m=K1jjXiSpq8gyj94l7 > > 2zy7qbh3u5mbWHN5tyx7DGuNr0&s=PqRtTawu33I0PvL4EuCjd5b6auAIT5N9buOGkcW5IiY&e > > = html+java+both > > $ cd html+java+both > > $ git log boot/src/main/java/net/java/html/boot/BrowserBuilder.java > > > > This gives you just two log entries. The initial checkin and change of the > > headers to Apache. But then the magic comes: > > > > $ git remote add emilian > > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_emilianbo > > ld_netbeans-2Dhtml4j&d=DwIBaQ&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK1 > > 0&r=tnLz5-vaI8x9g_xBBlFGf_ldS0-TN1M3i9fMP1FPWgk&m=K1jjXiSpq8gyj94l72zy7qbh > > 3u5mbWHN5tyx7DGuNr0&s=DAEkFbZcdjFsVNkQ1RC3zR_ZWAMZhC1Jc45wctL-ZnE&e= $ git > > fetch emilian > > $ git replace 408363d d029b8e > > > > And when you search the log, or use the blame tool, the full history is > > available: > > > > $ git log boot/src/main/java/net/java/html/boot/BrowserBuilder.java > > $ git blame boot/src/main/java/net/java/html/boot/BrowserBuilder.java > > > > Thanks Emilian! > > -jt
