You are viewing a plain text version of this content. The canonical link for it is here.
Posted to proton@qpid.apache.org by Alan Conway <ac...@redhat.com> on 2015/02/16 20:32:05 UTC
Please can we get rid of the trunk branch (or make it a symlink to
master)
I work on a mix of SVN and GIT-based projects so I switch between trunk
and master a lot. Proton used to be an SVN based project. I repeatedly
stub my toe on the old "trunk" branch which has been left lying around
with some random commit at it's head.
Can we please do any one of the following:
- delete it.
- rename it to something else.
- make it a symbolic reference to master.
I don't care which, I'm just tired of typing "git checkout trunk" by
reflex and being allowed to continue down the rat-hole till some ancient
proton bug crops up and I have another DOH! moment.
Cheers,
Alan.
Re: Please can we get rid of the trunk branch (or make it a symlink
to master)
Posted by Rafael Schloming <rh...@alum.mit.edu>.
On Mon, Feb 16, 2015 at 3:40 PM, Dominic Evans <do...@uk.ibm.com>
wrote:
> Rafael Schloming <rh...@alum.mit.edu> wrote on 16/02/2015 20:02:07:
> >
> > On Mon, Feb 16, 2015 at 2:32 PM, Alan Conway <ac...@redhat.com> wrote:
> >
> > > I work on a mix of SVN and GIT-based projects so I switch between
> trunk
> > > and master a lot. Proton used to be an SVN based project. I repeatedly
> > > stub my toe on the old "trunk" branch which has been left lying around
> > > with some random commit at it's head.
> > >
> > > Can we please do any one of the following:
> > > - delete it.
> > > - rename it to something else.
> > > - make it a symbolic reference to master.
> > >
> >
> > I'm not much of a git expert, so I don't know what the preferred option
> > would be, but I'm +1 for killing it in one form or another.
> >
> > --Rafael
>
> +1 for deleting it
>
> Whilst we're on the topic, could we delete the stale branches currently
> held
> on origin? Some are *very* out-of-date compared with master, see
> https://github.com/apache/qpid-proton/branches/stale
>
> Similarly, could we also delete the 0.1-0.9-alpha-1 version number
> branches?
> Unless we're backporting fixes, it probably doesn't make sense to have
> version
> branches. Currently we have identically named tags (although 0.9-alpha-1
> is missing),
> and tags have the advantage of being immutable, whereas anyone could
> accidentally push to a version branch.
>
I certainly don't object to deleting stale branches. The 0.9-alpha-1 branch
is an artifact from my first attempt at a release script for git. I hadn't
quite figured out how to get tags to work properly, so we have a branch
instead, but there isn't much point in keeping it around.
--Rafael
Re: Please can we get rid of the trunk branch (or make it a symlink to
master)
Posted by Dominic Evans <do...@uk.ibm.com>.
Rafael Schloming <rh...@alum.mit.edu> wrote on 16/02/2015 20:02:07:
>
> On Mon, Feb 16, 2015 at 2:32 PM, Alan Conway <ac...@redhat.com> wrote:
>
> > I work on a mix of SVN and GIT-based projects so I switch between
trunk
> > and master a lot. Proton used to be an SVN based project. I repeatedly
> > stub my toe on the old "trunk" branch which has been left lying around
> > with some random commit at it's head.
> >
> > Can we please do any one of the following:
> > - delete it.
> > - rename it to something else.
> > - make it a symbolic reference to master.
> >
>
> I'm not much of a git expert, so I don't know what the preferred option
> would be, but I'm +1 for killing it in one form or another.
>
> --Rafael
+1 for deleting it
Whilst we're on the topic, could we delete the stale branches currently
held
on origin? Some are *very* out-of-date compared with master, see
https://github.com/apache/qpid-proton/branches/stale
Similarly, could we also delete the 0.1-0.9-alpha-1 version number
branches?
Unless we're backporting fixes, it probably doesn't make sense to have
version
branches. Currently we have identically named tags (although 0.9-alpha-1
is missing),
and tags have the advantage of being immutable, whereas anyone could
accidentally push to a version branch.
Cheers,
Dom
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number
741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
Re: Please can we get rid of the trunk branch (or make it a symlink
to master)
Posted by Timothy Bish <ta...@gmail.com>.
On 02/16/2015 03:02 PM, Rafael Schloming wrote:
> I'm not much of a git expert, so I don't know what the preferred option
> would be, but I'm +1 for killing it in one form or another.
>
> --Rafael
You can submit a request to INFRA to drop it, the only caveat is that
there is no enforcement to prevent someone from accidentally recreating
it so you might have to do it once or twice until everyone gets used to
things being on master instead of trunk.
>
> On Mon, Feb 16, 2015 at 2:32 PM, Alan Conway <ac...@redhat.com> wrote:
>
>> I work on a mix of SVN and GIT-based projects so I switch between trunk
>> and master a lot. Proton used to be an SVN based project. I repeatedly
>> stub my toe on the old "trunk" branch which has been left lying around
>> with some random commit at it's head.
>>
>> Can we please do any one of the following:
>> - delete it.
>> - rename it to something else.
>> - make it a symbolic reference to master.
>>
>> I don't care which, I'm just tired of typing "git checkout trunk" by
>> reflex and being allowed to continue down the rat-hole till some ancient
>> proton bug crops up and I have another DOH! moment.
>>
>> Cheers,
>> Alan.
>>
>>
--
Tim Bish
Sr Software Engineer | RedHat Inc.
tim.bish@redhat.com | www.redhat.com
skype: tabish121 | twitter: @tabish121
blog: http://timbish.blogspot.com/
Re: Please can we get rid of the trunk branch (or make it a symlink
to master)
Posted by Rafael Schloming <rh...@alum.mit.edu>.
I'm not much of a git expert, so I don't know what the preferred option
would be, but I'm +1 for killing it in one form or another.
--Rafael
On Mon, Feb 16, 2015 at 2:32 PM, Alan Conway <ac...@redhat.com> wrote:
> I work on a mix of SVN and GIT-based projects so I switch between trunk
> and master a lot. Proton used to be an SVN based project. I repeatedly
> stub my toe on the old "trunk" branch which has been left lying around
> with some random commit at it's head.
>
> Can we please do any one of the following:
> - delete it.
> - rename it to something else.
> - make it a symbolic reference to master.
>
> I don't care which, I'm just tired of typing "git checkout trunk" by
> reflex and being allowed to continue down the rat-hole till some ancient
> proton bug crops up and I have another DOH! moment.
>
> Cheers,
> Alan.
>
>
Re: Please can we get rid of the trunk branch (or make it a symlink
to master)
Posted by Alan Conway <ac...@redhat.com>.
On Mon, 2015-02-16 at 17:47 -0500, Andrew Stitcher wrote:
> On Mon, 2015-02-16 at 14:32 -0500, Alan Conway wrote:
> > I work on a mix of SVN and GIT-based projects so I switch between trunk
> > and master a lot. Proton used to be an SVN based project. I repeatedly
> > stub my toe on the old "trunk" branch which has been left lying around
> > with some random commit at it's head.
> >
> > Can we please do any one of the following:
> > - delete it.
> > - rename it to something else.
> > - make it a symbolic reference to master.
> >
> > I don't care which, I'm just tired of typing "git checkout trunk" by
> > reflex and being allowed to continue down the rat-hole till some ancient
> > proton bug crops up and I have another DOH! moment.
>
> Why do you say there is a trunk branch at apache at all? (didn't we go
> over this before - it seems familiar). As far as I can tell the apache
> repo has no branch called trunk.
>
> You probably need to prune your local repo's idea of the remote
> branches.
>
> Try
>
> git remote prune origin (or whatever your apache remote is called)
>
You are right. Apologies for spam!
Re: Please can we get rid of the trunk branch (or make it a symlink
to master)
Posted by Andrew Stitcher <as...@redhat.com>.
On Mon, 2015-02-16 at 14:32 -0500, Alan Conway wrote:
> I work on a mix of SVN and GIT-based projects so I switch between trunk
> and master a lot. Proton used to be an SVN based project. I repeatedly
> stub my toe on the old "trunk" branch which has been left lying around
> with some random commit at it's head.
>
> Can we please do any one of the following:
> - delete it.
> - rename it to something else.
> - make it a symbolic reference to master.
>
> I don't care which, I'm just tired of typing "git checkout trunk" by
> reflex and being allowed to continue down the rat-hole till some ancient
> proton bug crops up and I have another DOH! moment.
Why do you say there is a trunk branch at apache at all? (didn't we go
over this before - it seems familiar). As far as I can tell the apache
repo has no branch called trunk.
You probably need to prune your local repo's idea of the remote
branches.
Try
git remote prune origin (or whatever your apache remote is called)
HTH
Andrew