Looking for advice on setting up a test repository
Kevin Bullock
kbullock+mercurial at ringworld.org
Tue Oct 26 16:59:42 UTC 2010
On Oct 26, 2010, at 11:39 AM, Martin Geisler wrote:
> Raghuram Devarakonda <draghuram at gmail.com> writes:
>
>> Hi,
>>
>> We use Subversion at our company and are finding the merge process
>> between branches a not too pleasant experience. As I have heard a lot
>> recently about a DVCS being much better for merging, I thought I would
>> set up a hg repository to mirror our current Subversion one so that I
>> can test merge in both Subversion and hg and compare.
>
> Well, if there is a conflicts between the two branches, then both
> Subversion and Mercurial will need your help to resolve it. Mercurial
> cannot magically merge better than Subversion, except when you run into
> bugs in Subversion:
Not magically, but Mercurial does have access to the nearest common ancestor of two changes while computing the merge, which leads to much less need for manual intervention. Has Subversion grown this capability in the time since I last used it, such that the 'normal' Subversion workflow takes advantage of the merge info tracking?
> http://mercurial.aragost.com/kick-start/tasks.html#merging-renamed-files-in-subversion
>
> In my opinion, the thing that makes merges easier in Mercurial is that
> you merge often. Frequent merges ensures that the merges are small and
> thus easier to resolve. Mercurial also has the full information about
> what has and has not been merged.
Funny, I've always heard the inverse argument: merges happen more frequently in Mercurial because they're easier to accomplish, because the nearest common ancestor is available to the merge machinery.
Or perhaps it's the case that since individual changesets tend to be smaller in hg (since they can happen offline), the merge machinery can process them more easily?
pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock
> Subversion also tracks merge information these days, but it requires you
> to use different commands depending on the direction of the merge. This
> makes merges a bit more complicated. I asked in #mercurial, and people
> told me that they have had problems with conflicts in the SVN merge info
> itself, something which should of course not happen...
>
>> The Subversion repository has a trunk and few branches from the trunk.
>> Some of the branches are for development while others are release
>> branches. Is it possible to set up a hg repo structure mimicking this
>> set up? If so, I would appreciate it if some one can briefly explain
>> the procedure to do so. If it makes any difference, I would be trying
>> this on Linux.
>
> Give the hgsubversion extension a try, it will let you convert from
> Subversion to Mercurial:
>
> http://bitbucket.org/durin42/hgsubversion/wiki/Home
> http://mercurial.aragost.com/kick-start/hgsubversion.html
>
> --
> Martin Geisler
>
> aragost Trifork
> Professional Mercurial support
> http://aragost.com/mercurial/
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
More information about the Mercurial
mailing list