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

[Matt Mackall]

On Tue, 2009-03-17 at 16:04 -0400, 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

This breaks tests quite badly. Which suggests we need to rethink the
approach here and in fetch.

'Inactive' is not really a good cue not to use a branch. Users regularly
make important branches temporarily inactive by starting a new branch at
their heads.

-- 
http://selenic.com : development and support for Mercurial and Linux