Backing out a bad merge after incorrect use of Transplant

[ee7arh]

Hi,

We just had a nasty situation which we couldn't figure out how to resolve
after using the Transplant command incorrectly.

We have 2 branches: default and integration.

A changeset was committed to default branch which needed to be transplanted
onto integration branch. We could not merge the head of default to
integration since there were other changesets behind which did not yet need
to be on the integration branch, that is why we wanted to use the HG
Transplant command.

When using the Transplant command (inside MercurialEclipse), we accidentally
used the "merge" option and so the changeset was transplanted onto
Integration branch successfully but was also recorded as a merge thus having
2 parents (the transplanted changeset from default branch and the last
changeset from integration branch). In effect, Mercurial showed that a
complete merge had been made from default to integration even though only
the diffs of the Transplanted changeset went over.

This meant that when we later added changesets onto the Integration branch
and attempted to merge those changesets back to default branch (part of our
normal workflow), the net result was that Mercurial attempted to delete a
lot of code (which had been committed earlier in the default branch). At
this point we realised that we had messed up the Transplant command and
should not have used the merge option.

Since changes were pushed to a central repository, we attempted to do a
Backout of that merge favouring the parent changeset on the default branch.
This worked, but did not solve our problem since the merge from integration
back to default still wanted to delete lots of files.

Anybody an idea how to resolve such a situation without Stripping out the
changesets completely? 

Thanks and BRegards
Andrew



--
View this message in context: http://mercurial.808500.n3.nabble.com/Backing-out-a-bad-merge-after-incorrect-use-of-Transplant-tp3996612.html
Sent from the General mailing list archive at Nabble.com.