[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: merge performance (was: Re: Distributed Subversion)

From: Trent Nelson <tnelson_at_onresolve.com>
Date: Thu, 11 Jun 2009 22:00:25 +0100

> Subversion's merge tracking allows you to merge from only a subset
> of paths modified during a given revision.

I'm interested to hear how much use this 'feature' gets in the wild.

Anyone out there in the user base fanatical about this feature? Is anyone relying on it heavily? Has the introduction of this feature in 1.5 allowed you to finally drop the 'burden' of 1.4+svnmerge.py?

Personally, as much as I hate to admit it, the more I work with 1.5+, the more I wish I could go back to the 1.4 days with svnmerge.py. I'm quite surprised how obtuse `svn merge` is in comparison to svnmerge.py:

branches/foo>svnmerge.py avail
branches/foo>svn mergeinfo --show-revs eligible https://svn.internal.com/europe/repo/trunk

trunk>svnmerge.py merge foo
trunk>svn merge --reintegrate https://svn.internal.com/europe/repo/branches/foo .

branches/foo>svnmerge.py block 100
branches/foo>svn merge --record-only -c 100 https://svn.internal.com/europe/repo/trunk .

Am I alone?

For what it's worth, my Subversion utopia looks something like this:

trunk>svn branch foo
Branch created at ../branches/foo

branches/foo>svn sync
Synchronised with trunk.

branches/foo>svn sync
Synchronised with trunk. 6 file(s) are in conflict.

branches/foo>svn status
You have 6 outstanding changes.
There are 19 new changes in trunk since last synchronisation.
3 of these changes conflict with files you're working on.

branches/foo>svn deliver
Delivered 6 changes to trunk. Retire branch? [Y/N]: N

branches/foo>svn retire
Deliver 8 outstanding changes before retiring branch? [Y/N]: Y
Synchronised with trunk.
Delivered 8 changes to trunk.
Retired branch.


trunk>tag 2009.06
Tagged trunk as 2009.06.3.

tags/2009.06.3>echo foo > foo.txt && svn add foo.txt && svn ci -m ""
Error: tags are read-only.
Looking for previous tag...
Found previous tag: 1.0.56
Tagged trunk as 1.0.57.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-11 23:02:40 CEST

This is an archived mail posted to the Subversion Users mailing list.