hgsubversion

TortoiseHG and hgsubversion (Windows): “no module named hgsubversion”

北城以北 提交于 2020-01-02 01:29:14
问题 I have installed the newest version of TortoiseHG for Windows from https://tortoisehg.bitbucket.io/download/index.html (2.8.1) I did hg clone http://bitbucket.org/durin42/hgsubversion . And have the correct path set in mercurial.ini: [extensions] hgsubversion = C:\hgextensions\hgsubversion\hgsubversion If I do: hg version --svn I can see that hgsubversion seems to be installed correctly: Mercurial Distributed SCM (version 2.6.2) (see http://mercurial.selenic.com for more information)

Sync svn and mercurial repo

笑着哭i 提交于 2019-12-25 06:07:42
问题 We have an active svn repository and we are planning a migration to mercurial. The idea is to create a new mercurial repo, sync the svn repo with it with history, create a teamcity build for it and move two developers onto mercurial solely to trial it out and make sure its all kosher. This means we need bi-directional sync between svn and mercurial. I have seen this link Syncing SVN to Mercurial using svnsync & hg convert -- misses svn:externals? which sort of describes a way but it is fairly

Using the Mercurial hgsubversion extension with SVN Externals

拟墨画扇 提交于 2019-12-10 16:08:29
问题 I'm using Mercurial to talk to a Subversion repository, and the repository is currently using SVN externals to pull in another repository. hgsubversion works really well for communicating with the repository, but it doesn't seem to work with SVN Externals. Is there a way to configure it to work with this? EDIT: Partial Solution SVN Externals can be pulled down just fine. In your repository, add a new file called .hgsvnexternals (if Windows is complaining about not having a file name when you

TortoiseHG and hgsubversion (Windows): “no module named hgsubversion”

点点圈 提交于 2019-12-05 02:04:47
I have installed the newest version of TortoiseHG for Windows from https://tortoisehg.bitbucket.io/download/index.html (2.8.1) I did hg clone http://bitbucket.org/durin42/hgsubversion . And have the correct path set in mercurial.ini: [extensions] hgsubversion = C:\hgextensions\hgsubversion\hgsubversion If I do: hg version --svn I can see that hgsubversion seems to be installed correctly: Mercurial Distributed SCM (version 2.6.2) (see http://mercurial.selenic.com for more information) Copyright (C) 2005-2012 Matt Mackall and others This is free software; see the source for copying conditions.

How to handle merges with hgsubversion?

混江龙づ霸主 提交于 2019-12-03 07:52:47
问题 I am trying to contribute to a project that uses Subversion. I used Mercurial and its hgsubversion extension to clone the repo. My work takes place on a feature branch. How do I keep the feature branch up to date with stuff that happens on the default branch (hg speak) aka the trunk (svn speak)? So I used hg up feature to update to the feature branch, then hg pull which gave me changesets on the default branch. So I did hg merge default , the committed the merge, then tried hg push to send my

Submitting Hg changes back to SVN

无人久伴 提交于 2019-12-03 07:14:03
问题 I've began work in an SVN repository. I've cloned a subfolder of it into a local Hg repo with hg clone . Afterwards, I wanted to share this with a colleague who does not have access to the SVN repository. I've created a private BitBucket repository, and we occasionally pushed the changes, and hence I had to pull them. hgsubversion does some nasty things to changesets, such as changing their committer (and I believe even the hash). When I tried pushing and pulling to the BitBucket repo, I had

How to handle merges with hgsubversion?

自闭症网瘾萝莉.ら 提交于 2019-12-02 21:15:30
I am trying to contribute to a project that uses Subversion. I used Mercurial and its hgsubversion extension to clone the repo. My work takes place on a feature branch. How do I keep the feature branch up to date with stuff that happens on the default branch (hg speak) aka the trunk (svn speak)? So I used hg up feature to update to the feature branch, then hg pull which gave me changesets on the default branch. So I did hg merge default , the committed the merge, then tried hg push to send my changesets to Subversion. And Mercurial said: "Sorry, can't find svn parent of a merge revision." I

Submitting Hg changes back to SVN

送分小仙女□ 提交于 2019-12-02 20:44:52
I've began work in an SVN repository. I've cloned a subfolder of it into a local Hg repo with hg clone . Afterwards, I wanted to share this with a colleague who does not have access to the SVN repository. I've created a private BitBucket repository, and we occasionally pushed the changes, and hence I had to pull them. hgsubversion does some nasty things to changesets, such as changing their committer (and I believe even the hash). When I tried pushing and pulling to the BitBucket repo, I had to do a merge. Now I am unable to push changes back into the Subversion repository due to our beloved

interoperation between mercurial and subversion

倾然丶 夕夏残阳落幕 提交于 2019-11-30 04:44:28
A similar question has been asked recently, but is not the same. The Mercurial website has a detailed page listing comparisons for 4 different options for getting Mercurial and Subversion to interoperate. I am wondering if anyone out there has tried one or more of these, and could relate any really good or really bad experiences. The note on the hgsubversion download says hgsubversion is an extension for Mercurial that allows using Mercurial as a Subversion client. Right now it is not ready for production use. You should only be using this if you're ready to hack on it, and go diving into the

Steps needed to allow hgsubversion SVN clone to push back

可紊 提交于 2019-11-30 02:27:40
I am working on a team that uses SVN primarily, whereas I prefer to use Mercurial when possible. I set up an hg clone of the SVN repo using hgsubversion, and several basic pulls/commits/pushes seemed to function fine. Now after 2 weeks of local development (during which time I've merged in changes from an external hg repo, and merged in changes from the SVN repo multiple times), I've attempted to push to the SVN repo, but failed with this message: abort: Sorry, can't find svn parent of a merge revision. I've found other users encountering the same problem, with how-tos on how to avoid this