rollback/backout a wrong merge between named branches?
Ringo De Smet
ringo.desmet at gmail.com
Thu Oct 8 16:32:05 UTC 2009
Marijn,
2009/10/8 Marijn Vriens <marijn at metronomo.cl>:
>
> Here's an idea: Update (hg up) to the revision of the 1.5 just before the
> merge occurred. This is the latest revision in the branch that doesn't have
> problems and just continue work from there. The next commit will create a
> new head inside the 1.5 branch.
>
> Yes, there will be a dangling head with a bad merge in the history, but
> that's of no concern. If it really bothers, stripping those revisions out
> might be an option, though, if someone doens't do it, and you pull from
> them, you will again receive the head with the bad merge.
Unfortunately, I have a pretxnchangegroup hook on the server that
prevents multiple heads on a branch. The reason here is that our
Hudson continuous integration server ends up getting blocked because
it doesn't know which head to use. So in our case, multiple heads on a
branch are not allowed.
Ringo
More information about the Mercurial
mailing list