All, Clean-up is almost done, but I have a question.
Would anyone have a suggestion on what to do with the multiple RC branches? We currently have some inconsistency around version related branches, with branches like "support/nifi-0.6.x" or even "release-nifi-0.1.0-rc13" but no branch like "support/nifi-0.7.x". Happy to create the appropriate branches but wondering if we prefer using tags for release control? Tag land looks to be in far better shape with a reasonably consistent naming convention (i.e. rel/version is being used since 0.6.1 and before that version). Ready to organise the required changes once we reach an agreement Cheers On Sat, Sep 24, 2016 at 3:25 PM, Andre <[email protected]> wrote: > All, > > Seems like we are making some progress around this. Some of the branches > have been already deleted and some more have been documented and deleted. > > The following branches belong to closed ticket but had commits ahead of > master and were left behind until we clarify they are safe to delete > > NIFI-274 - bbende > NIFI-376 - mcgilman > NIFI-631 - trkurc > NIFI-640 - mcgilman > NIFI-731 - marlap14 > NIFI-744 - markap14 > NIFI-919 - bbende > NIFI-1073 - trkurc > NIFI-1107 - trkurc > > > The following branches have been documented as part of NIFI-2817 and > deleted > > ListHDFS - e0d4484ee8e7b80fe3b47d5bb132d95019253a46 > NIFI-25 - 0211d0d71561fb63df4a06cd7b1a3b430b7a3e6c > NIFI-259 - 16f185245309ac3bcf9629b1c4d4dc655f18ca68 > NIFI-433 - e1e1aecc8b8e6c75f260edf248f046c1557c088b > NIFI-730 - dbf0c7893fef964bfbb3a4c039c756396587ce12 > NIFI-810-InputRequirement - 0636f0e731cd28299edd3a6e9db90de5045ab662 > NIFI-1085 - 6add372bc142304ef25e0bafb49709654a995f08 > > Cheers > > On Fri, Jul 22, 2016 at 8:26 AM, Andre <[email protected]> wrote: > >> Devs, >> >> I was wondering if anyone had any success deleting the stalled remote >> branches? >> >> Should we perhaps add the clean up as part of 1.0s the release cycle? >> >> Cheers >> >> On 7 Jun 2016 22:42, "Joe Witt" <[email protected]> wrote: >> >>> Definitely agree with the spirit of this thread. I am happy to do a >>> purge >>> on clearly dead branches. >>> >>> Of note there was a decent chunk of time where we could create branches >>> but >>> not remove them. >>> >>> Thanks. >>> Joe >>> On Jun 7, 2016 8:25 AM, "Joe Skora" <[email protected]> wrote: >>> >>> > +1 for cleaning up the *Branches for resolved tickets* group. >>> > >>> > The other groups should probably be reviewed by the last committers and >>> > removed if appropriate. >>> > >>> > A Jira ticket (or tickets) identifying each branch and its last commit >>> hash >>> > will document their removal while also making it easy to recreate them >>> if >>> > needed from the last commit. >>> > >>> > >>> > On Tue, Jun 7, 2016 at 7:58 AM, Andre <[email protected]> wrote: >>> > >>> > > Devs, >>> > > >>> > > It seems like the git tree is filled with stagnated / legacy branches >>> > > covering issues that have been already resolved. >>> > > >>> > > Unclear ticket number >>> > > Branch name - last committer (date) - Suspected related issue >>> > > - improve-prov-performance - mcgilman (Apr 2015) - suspect it is >>> NIFI-524 >>> > > - journaling-prov-repo - markap14 - (Mar 2015) - Suspect it is >>> NIFI-388 >>> > > - prov-query-language - markap14 (Mar 2015) - Suspect it is NIFI-40 >>> > > - ListHDFS - markap14 (Apr 2015) - Suspect it is NIFI-533 >>> > > >>> > > Branches for resolved tickets >>> > > - Issue (Resolved date) >>> > > - NIFI-25 (Apr 2015) >>> > > - NIFI-259 (Feb 2016) >>> > > - NIFI-274 (Nov 2015) >>> > > - NIFI-376 (Aug 2015) >>> > > - NIFI-433 (May 2015) >>> > > - NIFI-631 (Nov 2015) >>> > > - NIFI-640 (July 2015) >>> > > - NIFI-655 (Dec 2015) >>> > > - NIFI-730 (Nov 2015) >>> > > - NIFI-731 (Jul 2015) >>> > > - NIFI-744 (Aug 2015) >>> > > - NIFI-810-InputRequirement (Oct 2015) >>> > > - NIFI-919 (Sep 2015) >>> > > - NIFI-1073 (Nov 2015) >>> > > - NIFI-1085 (Nov 2015) >>> > > - NIFI-1107 (Feb 2016) >>> > > >>> > > >>> > > Branches with Open tickets >>> > > - Issue - Owner (Last update) >>> > > - NIFI-725-master - Dan Bress (Aug 2015) >>> > > - NIFI-818 - Mark Payne (Nov 2015) >>> > > - NIFI-964 - Bryan Bende (Nov 2015) >>> > > - NIFI-1050 - 65534 (Oct 2015) >>> > > - NIFI-1563 - Mark Payne (Apr 2016) >>> > > >>> > > >>> > > Branches with heavy development ongoing (probably should leave >>> there...) >>> > > - NIFI-1323 - 65534 (Jun 2016) >>> > > >>> > > >>> > > Note that although I suspect the releases are published under tags, >>> the >>> > > list above does not include what seem to be RC branches, >>> > > >>> > > >>> > > >>> > > *Remember* that keeping things tidy help the project look >>> professional. >>> > :-P >>> > > >>> > > >>> > > Jokes aside may I suggest someone spend some time cleaning some of >>> these >>> > > branches? >>> > > >>> > > Wouldn't mind doing it myself but I don't have write access :-) >>> > > >>> > > Cheers >>> > > >>> > >>> >> >
