Re: Rebase safely (Re: cherry picking and merge)

2014-08-08 Thread Nico Williams
On Fri, Aug 08, 2014 at 10:34:43AM -0700, Mike Stump wrote: > On Aug 6, 2014, at 10:11 PM, Nico Williams wrote: > > Nah. Sun managed this for decades without a hitch, and for products > > much larger than GCC. See above. > > Ok. Ah, ok, perfect. I see how that method of working would cure the

Re: Rebase safely (Re: cherry picking and merge)

2014-08-08 Thread Mike Stump
On Aug 6, 2014, at 10:11 PM, Nico Williams wrote: > Nah. Sun managed this for decades without a hitch, and for products > much larger than GCC. See above. Ok. Ah, ok, perfect. I see how that method of working would cure the cherry-pick and merge don’t work problem mentioned at the top of the

Re: Rebase safely (Re: cherry picking and merge)

2014-08-06 Thread Nico Williams
On Wed, Aug 06, 2014 at 05:38:43PM -0700, Mike Stump wrote: > Oh, wait, maybe I have misunderstood the prohibition. I have: > >upstream <—— fsf >| > \ > | > v > Me <—> master <—> coworker. This looks a lot like what I meant about pro

Re: Rebase safely (Re: cherry picking and merge)

2014-08-06 Thread Nico Williams
On Wed, Aug 06, 2014 at 02:44:59PM -0500, Nico Williams wrote: > That means that you have/maintain an intermediate upstream, yes? > > This is a bit trickier since once in a while that intermediate upstream > and everyone downstream of it has to catch up with the real upstream. > > Here you have t