[PATCH 0 of 1] Backout of f02d7a562a21

Matt Mackall mpm at selenic.com
Fri Dec 17 14:33:35 CST 2010

On Fri, 2010-12-17 at 13:40 +0100, Erik Zielke wrote:
> This patch is a backout of f02d7a562a21 as discussed in http://markmail.org/thread/oxxjig5td6xz7cpr
> However in that patch I extracted some code into a function. Then this
> function was later edited (using as instead of , in catch
> clause). This caused a conflict when creating a backout change.

You should have been able to just resolve the conflict like a normal
merge and get the correct result.

I've queued your backout, thanks.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial-devel mailing list