StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POUsing Hg locally and pushing to an SVN repo when other team members are just working on SVN -- is this possible?
text
Body
copied!<p>I've found what appear to be very similar questions here on SO, with what appear to be good answers; but for some reason, I still can't seem to figure out how to get this to work. My concern is that it may simply not be possible.</p> <p>Here's the situation: I am working on a small team that uses a central SVN repository as our version control system. My pair programmer and I got frustrated not having the option of local commits (and didn't want to have to go through the hassle of using SVN branches), so we looked into using either Git or Mercurial as an SVN client and found that hgsubversion seems capable of doing what we want: to work locally on an Hg repository, commit locally, and only push to SVN when we're ready.</p> <p>When the time came to push, we received this error message from Hg:</p> <pre><code>Sorry, can't find svn parent of a merge revision. </code></pre> <p>I'm wondering if the problem is that we had to pull changes from SVN to get our teammates' updates, then merge with our local changes, and now Hg can't figure out how to make SVN happy? This seems to be the message I'm getting from the other SO questions & answers I've looked at; however, the advice that was dispensed in those cases (doing <code>hg rebase --svn</code>) seems not to work for us either; that same "can't find svn parent" message is given.</p> <p>Is this even possible? Or is it more trouble than it's worth when other developers on the team are making changes directly to SVN?</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload