X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=mail.ud03.udmedia.de; h=
	message-id:date:from:mime-version:to:subject:references
	:in-reply-to:content-type:content-transfer-encoding; s=beta; bh=
	C29/V+vsIkffIagUgmr6DIXlfrYivuKGoDPz8SWxfZk=; b=qVGZMU04vLQiqusO
	Nz0K7C7BfGlgRywOg3CBDM7f+V255c5CI+JZnlDK9OIgU/pOWP5n/jVjzPMkRYt+
	F4Co8qeBodKBpPL5OwmKVkuBplpFXosnzNj5RnkUQo15Nkymz8S4JwbSSJUx8ni0
	/2s+IPVnkUujn64S30u7syY7x10=
Message-ID: <50ACF554.4010204@jump-ing.de>
Date: Wed, 21 Nov 2012 16:37:56 +0100
From: Markus Hitter <mah AT jump-ing DOT de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2
MIME-Version: 1.0
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] branches
References: <CACwWb3DJsO8J_zAfcSLK=_4iviZy05ZiKj1TFMUUSA8nxO5TwA AT mail DOT gmail DOT com> <CAGde_xOFELRBJZ30utu1x+B-y+8Vo+EDGOKPLqyafO+i3ez0QQ AT mail DOT gmail DOT com> <CAC4O8c9Z3zmCeeeVU-=BpYTWv1J+3bBh-YcWyepV3U0nftf=gw AT mail DOT gmail DOT com>
In-Reply-To: <CAC4O8c9Z3zmCeeeVU-=BpYTWv1J+3bBh-YcWyepV3U0nftf=gw@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: geda-user AT delorie DOT com

Am 20.11.2012 20:14, schrieb Britton Kerin:
> 3. Bob rebases, which breaks something that he doesn't catch
 > 4. Bob pushes
 > 5. Its a hard mess to sort out since you don't have any
> working version with Bob's changes in the canonical repository

The idea is to rebase not the master branch, but feature/debug branches 
and cherry-pick the reviewed parts of debug/feature branches into master 
until the other branch dissolves into nothing. This way you can bisect 
in detail on the master branch to find regressions.

Merging tends to expose the problem you describe. A merge is like one 
big commit with all the changes between two branches. When searching 
regressions, you can go back on only one of the two branches. What, if 
both branches work fine, but not the combination/merge of both?


my $0.02
Markus

-- 
- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/