Message-ID: <44DA6DBE.6040907@lsrfire.ath.cx>
Date: Thu, 10 Aug 2006 01:20:30 +0200
From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
User-Agent: Thunderbird 1.5.0.5 (Windows/20060719)
MIME-Version: 1.0
To: Greg KH <greg@kroah.com>
CC: Chuck Ebbert <76306.1226@compuserve.com>, Pavel Machek <pavel@suse.cz>,
       Josh Boyer <jwboyer@gmail.com>,
       linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: Adrian Bunk is now taking over the 2.6.16-stable branch
References: <200608091749_MC3-1-C796-5E8D@compuserve.com> <20060809220048.GE3691@stusta.de> <20060809221854.GA15395@kroah.com>
In-Reply-To: <20060809221854.GA15395@kroah.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1914
Lines: 41

Greg KH schrieb:
> On Thu, Aug 10, 2006 at 12:00:49AM +0200, Adrian Bunk wrote:
>> On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
>>> Umm, is there some place we can check to see what you've applied?
>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
> 
> No, I would not use the main git tree to queue patches up.  What happens
> when you want to rip the middle one out because in review it turns out
> that it is incorrect?

You can have multiple branches in one git repository.  E.g. git's own
repository has a "master" branch containing all committed changes, a
"next" branch which is similar to a release candidate and is regularly
merged back into "master" if ready, and a "pu" branch which contains the
more experimental stuff.  The latter doesn't even have a continuous history.

And it has other branches containing different stuff, e.g. "man" is a
special branch containing the generated manpages.  You could also have
topic branches or one branch per submitter, or whatever.

> Please use a quilt tree of patches instead, and then only commit the
> patches when you do a release.  It's much simpler that way.

There's even a quilt clone based on git (http://www.procode.org/stgit/).
 I have never used it, though, so I can't comment on it.

That said, it's a good idea to keep the master branch continuous, i.e.
never delete it or reset it to some previous commit.  So, as you
suggest, have a staging area for patches and only commit the good ones
to your master branch.  You can use a branch in the same repo as staging
area, though.

You can do quite a lot of different things with just one git repository.
 :-D

Ren?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/