[PATCH] alter merge command to only consider active branch heads by default

Benjamin Pollack benjamin at bitquabit.com
Tue Mar 17 15:12:10 CDT 2009


On 3/17/09 4:04 PM, Benjamin Pollack wrote:
> # HG changeset patch
> # User Benjamin Pollack<benjamin at bitquabit.com>
> # Date 1237320069 14400
> # Node ID febcb7164ddacf30b498b68d5dd4c36ab6e04039
> # Parent  166b6b12df44819a48f094d2b1699f781dec889c
> alter merge command to only consider active branch heads by default
>    

Just as a note, even though I wrote the patch, I'm honestly unsure 
whether this is the correct approach.  We'll need similar lines anywhere 
we call repo.branchheads() and only want active branches--which seems to 
be the overwhelming majority of circumstances I can come up with.  I'm 
inclined to change repo.branchheads() to return only active, non-closed 
branches by default, and return other heads only on explicit request.  
Since repo.branchheads() makes a very deliberately decision to return 
closed heads at the moment, I did not want to change the function and 
its callers unless everyone feels that's the right way to proceed--and 
at any rate, I'd rather see these pinpoint patches get into 1.2.1 to 
make users happy while we figure it out, since that's probably going to 
be a more involved patch.

--Benjamin


More information about the Mercurial-devel mailing list