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 n...
Hello all, I'm having a discussion with the management about Subversion practices. I've asked them to tell the administrator to configure our Subversion repository so it's possible to change the commit comments afterwards, in case I missed something even of the proof-reading :-). My arguments are, Log messages which needs to be impro...
I come from a Subversion background, but I am slowly migrating to Mercurial. When starting on many of my projects, I would setup a development environment that was configured to a particular starting point in developing an app/webapp/program (much like a Maven 2 archetype, but not necessarily Java/Maven). Later I would checkout th...
I am using hg-subversion, and I have 2 different hg repositories one from our svn trunk, and one from a branch of the trunk. I would like to link them somehow. At some point in the history both Hg repositories will be identical is there some way to join them? In other words is there a way to relate the repositories from within Hg? The...
As a freelancer, I often work at companies who use Subversion repositories. It’d be handy if I could use Mercurial to get code from these repositories, track my changes when I’m offline, and then commit all my local changes to the company’s Subversion server when I’m back online. Does this work? Have you read any good tutorials on the ...
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 exist...
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 t...
repo layout: a/1 a/2 a/3 ... b/1 b/2 ... c/1 c/2 ... git-svn works perfect for me if I work on 1 svn repo subdir. But right now I'm facing the need to work on several subdirs (like, a/1, a/2, and b/1), and there's much shit in repo besides them. I've managed to write a regexp for this, but git-svn with --ignore-paths seems to check each...
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 y...
We've got a subversion repository set up like this: Repo A Sub-Project I Sub-Project II Repo B Repo C Recently, I've been tasked with piloting a Mercurial replacement solution. However, my project (Repo A\Sub-Project I), still needs to exist within Subversion, as that is what the build process uses (and can't be modified at the...
The online documentation for hgsubversion sucks, IMO (I hate to say that). I've been following the instructions in the Quick Start. What have I done? I installed Mercurial: D:\repos\experimental>hg --version Mercurial Distributed SCM (version 1.6) I installed TortoiseHg to match the Mercurial version. I downloaded the hgsubversion r...
I have a base repository, located at /home/bla/repo/BASE_REPOSITORY I create a new repository, located at /home/bla/repo/new Remember, the "new" repository already exists. I.e. I can't issue a command whereby the contents of the new one is deleted. I want to copy the BASE_REPOSITORY INTO this new repository. Can I do this? If so, how? ...
I'm using mercurial to talk to a SVN 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 External...
Hi, I've pulled the Subversion repository into a local Hg repository while at work. At home, I fixed some stuff, committed into my local Hg repository, and upon coming to work I did a pull and an update. $ hg pull $ hg update I needed to merge, so I did that. $ hg merge However, when I tried pushing: $ hg push abort: Sorry, can't...
Hi, 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...