rollback/backout a wrong merge between named branches?
Peer Sommerlund
peer.sommerlund at gmail.com
Thu Oct 8 12:59:35 UTC 2009
2009/10/8 Ringo De Smet <ringo.desmet at gmail.com>
> Hello,
>
> We have the situation where a developer merged code from an ongoing
> development branch to a stabilisation branch, rendering the
> stabilisation branch unstable. I read the HG book regarding rollback,
> revert, backout but none of the options seem to work for me, as the
> wrong merge has already been pushed to the central repo.
>
If only a few repositories are affected, and you have direct access to all
of them, you could strip the wrong changesets.
Otherwise I guess revert + some caution next time you merge from dev to
stable to make sure all changes are copied (and not hidden by the revert).
You could also update to the last OK cset and continue stabilistation from
that point - thereby branching. The "wrong" branch would have to be closed
(hg commit --close-branch).
Regards,
Peer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20091008/4014428a/attachment-0001.html>
More information about the Mercurial
mailing list