Merge revert

[Steve - Gadget Barnes]

On 04/10/2016 07:21, Nicolas Pinault wrote:
> Le 04/10/2016 à 03:40, Andrew Taumoefolau a écrit :
>> Have further commits been made on top of the branch merge?
> Yes. Commits on both branches.
>>> On 4 Oct. 2016, at 1:22 am, Nicolas Pinault <nicolasp at aaton.com> wrote:
>>>
>>> Hi,
>>>
>>> I accidentally merged 2 branches. Before I realize it I committed changes and pushed to the server.
>>> When I try to backout the merge node, I get : "abandon : cannot backout a merge changeset"
>>> What is the best way to correct this error ?
>>>
>>> Nicolas


If you type `hg help backout` you will see, about half way through, the
phrase "Note:  'hg backout' cannot be used to fix either an unwanted or
incorrect merge."

So this could be your issue!

AFAIK the only solution would be to use hg convert to export all of the
history prior to the erroneous merge, use patches to capture and apply
the changes after it and apply them to the converted repository and
switch out the old repository and the new one.  You will have to inform
all of your co-workers a) Not to commit anything while this is in
progress & b) to clone the new repository to a new area and apply any
uncommitted changes that they have to the new repository.

-- 
Steve (Gadget) Barnes
Any opinions in this message are my personal opinions and do not reflect
those of my employer.