[PATCH 0 of 1] Backout of f02d7a562a21

Erik Zielke ez at aragost.com
Fri Dec 17 06:40:07 CST 2010


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. So I
took the code from before the patch I am backing out and changed , to
as in the code, which was extracted to a function in the patch being
backed out.

Is that the correct procedure to handle such conflicts?


More information about the Mercurial-devel mailing list