RE: The merge from hell...

From: Brown, Len <len.brown@intel.com>
Date: Feb 3, 2006, 18:34 UTC
Message-ID: <F7DC2337C7631D4386A2DF6E8FB22B3005F34393@hdsmsx401.amr.corp.intel.com>

Show 17 quoted lines

>On Thu, Feb 02, 2006 at 10:28:43PM -0800, Junio C Hamano wrote:
>
> > > One thing I'd ask for: would it be possible to have more 
>descriptive 
> > > branch names than just numbers? Even if you want to track 
>it by bugzilla 
> > > entry number, how about calling it "bugzilla-12345" instead? 
> > 
> > When kernel people (not just Len) talk about a "bugzilla ID",
> > does that ID always come from the same namespace, or do some
> > subsystems have their own bugzilla?
>
>Not only do some subsystems have their own bugtracker (ALSA for eg),
>but referring to 'bugzilla' alone is meaningless, as it could
>mean bugme.osdl.org, bugzilla.redhat.com, bugzilla.novell.com,
>bugzilla.ubuntu.com etc etc, all of which are a prime source of
>juicy kernel bugs.

Naming the branch is just eye-candy for the merge comment. My topic branch labels in refs/my-branch never get to kernel.org, so you're not going to see the pretty green tags on topic branches branches that I see.

I include the full-URL of the bug report in the original commit comments for those who are interested. I think this it the important place to put it, and in practice I've found it to be extremely useful.

-Len