RE: Naming branches so that life is easier

2016-02-04 Thread Uwe Schindler
- Uwe Schindler H.-H.-Meier-Allee 63, D-28213 Bremen <http://www.thetaphi.de/> http://www.thetaphi.de eMail: u...@thetaphi.de From: Jack Krupansky [mailto:jack.krupan...@gmail.com] Sent: Thursday, February 04, 2016 3:00 PM To: Lucene-dev <dev@lucene.apache.org> Subject: Re: Naming

Re: Naming branches so that life is easier

2016-02-04 Thread Jack Krupansky
I don't recall any discussion of the status of existing svn non-release branches (most of which were named LUCENE-)... was it decided to just abandon them or are they hidden somewhere now in git/github? And is the new policy to encourage such branches in git/github or that people should

Re: Naming branches so that life is easier

2016-02-04 Thread Jack Krupansky
gt; > Uwe > > > > - > > Uwe Schindler > > H.-H.-Meier-Allee 63, D-28213 Bremen > > http://www.thetaphi.de > > eMail: u...@thetaphi.de > > > > *From:* Jack Krupansky [mailto:jack.krupan...@gmail.com] > *Sent:* Thursday, February 04, 2016

Re: Naming branches so that life is easier

2016-02-04 Thread Dawid Weiss
> was it decided to just abandon them or are they hidden somewhere now in > git/github? Read here: https://github.com/dweiss/lucene-git-guides/blob/master/10-locate-historical-svn-commit-or-branch.sh > The fact that all the tags have this long string of > "releases/(lucene|solr|lucene-solr)/"

RE: Naming branches so that life is easier

2016-02-04 Thread Uwe Schindler
Hi, > > was it decided to just abandon them or are they hidden somewhere now in > git/github? > > Read here: > https://github.com/dweiss/lucene-git-guides/blob/master/10-locate- > historical-svn-commit-or-branch.sh > > > The fact that all the tags have this long string of >

Re: Naming branches so that life is easier

2016-02-03 Thread Dawid Weiss
> The use of a single inserted ':' to mean "delete this branch" is a > scary design to me... This is scary, crappy and trappy (as Robert pointed out to me in a private discussion). Unfortunately there is no other syntax (that I know of) that could replace it. Also, branches (and tags) propagate

Re: Naming branches so that life is easier

2016-02-03 Thread Dawid Weiss
> Unfortunately there is no other syntax (that I know of) that could replace > it. Actually, you can create an alias for deleting a local (and remote) branch, but I think this is even more scary than just learning what the ':' stands for in a push... http://stackoverflow.com/a/16740731/1633019

Naming branches so that life is easier

2016-02-03 Thread Dawid Weiss
Hey folks. Just noticed new branches are being pushed to the Apache repository. Having digested SVN's branches I'd like to suggest a naming convention for branches so that they appear more palatable. For example: $ git branch -r origin/HEAD -> origin/master origin/apiv2 origin/branch_3x

Re: Naming branches so that life is easier

2016-02-03 Thread Michael McCandless
Thanks for the points Dawid ... I'll try to follow this going forward. The use of a single inserted ':' to mean "delete this branch" is a scary design to me... Mike McCandless http://blog.mikemccandless.com On Wed, Feb 3, 2016 at 4:59 AM, Dawid Weiss wrote: > Hey

Re: Naming branches so that life is easier

2016-02-03 Thread david.w.smi...@gmail.com
Establishing conventions and adhering to them would be good. Some observations I have with your example: you suggested a hypothetical branch named "dweiss/jira3826". IMO that branch name isn't a great name because it is ambiguous with respect to it being for Lucene or Solr. Most of our

Re: Naming branches so that life is easier

2016-02-03 Thread Dawid Weiss
Thanks Stefan, this is good to know! Dawid On Wed, Feb 3, 2016 at 4:22 PM, Stefan Matheis wrote: > since git 1.7.0 you can use "git push origin --delete " > instead of "git push origin :", which makes a bit more > sense :) found that option some time ago on >

Re: Naming branches so that life is easier

2016-02-03 Thread Stefan Matheis
since git 1.7.0 you can use "git push origin --delete " instead of "git push origin :", which makes a bit more sense :) found that option some time ago on http://stackoverflow.com/a/2003515 -Stefan On Wed, Feb 3, 2016 at 11:19 AM, Dawid Weiss wrote: >> Unfortunately there

Re: Naming branches so that life is easier

2016-02-03 Thread Shai Erera
I think that all remote branches should be JIRA related. I.e. I don't see myself pushing a remote branch like shaie/something. Since we do all development through JIRA, then if someone experiments with something and wants to push it to the Git repo, I think that should be done within the context