No pushing of a local Mercurial commits to SVN with HgSubversion?

Question

I am making say 4 local commits in HgSVN, then I updated my local code to an earlier revision, I added changes to it, did local commits, merged with server code and when tried to push, I was not allowed because of the 4 local commits not merged.

1. How to delete/remove these 4 local commits from HgSVN history and push the code ?

2. What should be done in this scenario ?

   • using HgCommit for saving code to the local machine and
   • HgWorkbench for pushing the local changes to the server
   • 

Answer 1

Your main big problem: you prefer do nor read docs and use tools blindly. Otherwise you have to know one of the biggest limitation of HgSubversion: it is not possible to push back to Subversion mergesets from Mercurial

"...Mercurial merges cannot be pushed to Subversion"

Also, HgSubversion page on Mercurial wiki clearly states:

The important point to note is that hgsubversion cannot push merge changesets to a svn repository. This means you should not try to merge this new head -- if you do so, hg push to svn will fail. Instead, you should rebase the changesets that you want to push to the Subversion repository (see Rebasing changes below)