[PATCH] fetch: do not count closed branches when attempting to infer a merge
John Mulligan
phlogistonjohn at asynchrono.us
Tue Mar 17 02:14:33 UTC 2009
On Mon, Mar 16, 2009 at 05:04:01PM -0400, Benjamin Pollack wrote:
> On 3/16/09 5:02 PM, Dirkjan Ochtman wrote:
> > Looks good. While we're at it: why is this not the default?
> >
I think I was trying to avoid changing the api too much. I wouldn't
object to making the change if possible.
> Good question, but meanwhile, it looks as if I didn't actually fix the
> bug. Please disregard the patch for the moment until I figure out
> what's going on here.
Since I think I caused this with the branch closing patches, please
let me know if I can help. I looked at the issue quickly and it looked
like the branchheads function was returning "buried" branch heads that
are currently in the cache but aren't actually heads.
We may want to fix that function first. Any thoughts?
>
> --Benjamin
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
More information about the Mercurial-devel
mailing list