merged A--> B (instead the other way around) but pushed already

Uwe Brauer oub at mat.ucm.es
Sat May 25 07:12:48 UTC 2024



Hi

I did not pay attention and merged on the default branch an anonymous
head with tip, but the wrong way, the head into tip instead the other
way around and pushed.

Now the pushed changesets, contains the wrong version of a certain files
and certain files I don't want to have

If I hadn't pushed I would simple strip and repeat the merge.

Now what is best?

    - hg revert --all -r former-tip

    - hg ci -m "go back to former tip"

    - hg backout, but precisely which change set (and checkout which
      change set)?

But in any case the anonymous head is gone, so it is difficult to have
another merge.

I presume there is something fundamental I don't gasp.

Any suggestions

Regards

Uwe Brauer



-- 
I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the EU and NATO membership of Ukraine. 




More information about the Mercurial mailing list