pbranch for tracking upstream

[Mark A. Flacy]

On Mon, 2010-08-16 at 14:41 -0400, Neal Becker wrote:
>
> I'm confused about patch dependency.  My patches should all be independent.  
> But when I tried to set things up this way (edit pgraph so that all branches 
> depended only on default), I don't think I got what I wanted.  My working 
> directory then only had 1 patch, not the union of all the patches.

Did you set up a join branch and make it depend upon all of your other
patches, as in the tutorial?  What does your log graph look like now?

> Do I want to just have this as a linear graph (even though in reality there 
> is no actual dependency between the patches)?

That's what I did, but my patches did have dependencies.

> 
> If I do this, my working directory is correct (the union of all the 
> patches).  I'm just not sure what happens when upstream later adopts my 
> patch (or something close to it).  That was my whole objective in trying 
> pbranch.  I want to be able to drop my local patch when it is later adopted 
> upstream.  *** upstream will not be using hg!!! ***.  Maybe in that case 
> pbranch doesn't help?

It helps; that's the situation that I had with the KPhone code base.

-- 
Mark A. Flacy <mflacy at verizon.net>