1

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
    • using HgCommit for saving code to the local machine and HgWorkbench for pushing the local changes to the server
Lazy Badger
  • 94,711
  • 9
  • 78
  • 110
proton
  • 658
  • 1
  • 7
  • 26
  • 1
    local commits & push are not terms that seem to relate to subversion. Are you talking about using two separate repositories? – crashmstr Feb 21 '13 at 13:00
  • @crashmstr: I am using HgCommit and HgWorkbench for submitting locally(local commits) and to server(push) respectively. – proton Feb 21 '13 at 13:45
  • This does not seem like normal workflow. HgCommit would be Mercurial, I assume. So is this a Mercurial question or tortoise? If you're mixing the two, isn't that asking for trouble? – Chris Thornton Feb 21 '13 at 13:54
  • @ppu you really need to change your tags and title, since your question now reads *very* differently. – crashmstr Feb 21 '13 at 15:12
  • @crashmstr : made the tag change hope its the right one. – proton Feb 21 '13 at 18:26
  • I voted for closing this question, because it has serious quality problems: poorly formulated, doesn't contain mandatory data (log of commands, glog output or screenshot of DAG), used not-conventional terms – Lazy Badger Feb 22 '13 at 01:02

1 Answers1

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)

Lazy Badger
  • 94,711
  • 9
  • 78
  • 110