hgsubversion

interoperation between mercurial and subversion

由 孤街浪徒 提交于 2019-11-29 02:36:51
问题 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

Steps needed to allow hgsubversion SVN clone to push back

由 跟風遠走 提交于 2019-11-29 00:08:58
问题 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

Mercurial to Mercurial to Subversion Workflow Problem

由 ╄→尐↘猪︶ㄣ 提交于 2019-11-28 05:00:41
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate Mercurial repository to the existing Subversion repository. After a period of time, we'll simply obsolete the Subversion repository and the intermediate Mercurial repository will become the new system of record. Dev 1 Local --+--> Mercurial --+--> Subversion Dev 2 Local --+ + Dev 3 Local --+ +

Using git-svn (or similar) *just* to help out with an svn merge?

由 落爺英雄遲暮 提交于 2019-11-27 10:53:14
Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts - and some of them seem spurious. Given that git is praised for a superiour merge experience, Would it be any good to use git-svn just for the benefit of making the merge more manageable? Can you recommend other alternatives (eg. svk , hgsvn ) to lessen the merge pain? Some conflicts are easy enough to resolve (e.g java imports, whitespaces) - so I'm also wondering if there is any automated solutions for those. A full switch to DVCS might happen in the

Mercurial to Mercurial to Subversion Workflow Problem

由 半腔热情 提交于 2019-11-27 00:44:46
问题 We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate Mercurial repository to the existing Subversion repository. After a period of time, we'll simply obsolete the Subversion repository and the intermediate Mercurial repository will become the new

Using git-svn (or similar) *just* to help out with an svn merge?

由 半腔热情 提交于 2019-11-26 17:58:29
问题 Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts - and some of them seem spurious. Given that git is praised for a superiour merge experience, Would it be any good to use git-svn just for the benefit of making the merge more manageable? Can you recommend other alternatives (eg. svk , hgsvn ) to lessen the merge pain? Some conflicts are easy enough to resolve (e.g java imports, whitespaces) - so I'm also
订阅 hgsubversion