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

Re: svnmerge.py vs. build-in merge support since version 1.5

From: Blair Zajac <blair_at_orcaware.com>
Date: Wed, 20 Jan 2010 19:23:15 -0800

Dieter Oberkofler wrote:
> I have been using svnmerge.py for quite a while and although I was looking
> forward for the build-in functionality it worked quite well. After now
> upgrading to version 1.6 with the build-in functionality that replaces the
> need for svnmerge.py I'm a little surprised that not all of the script
> functionality seems to be available or I'm just unable to find it:
> 1) svnmerge.py did generate an informative commit message listing all the
> logs of the merged revisions is generated in a text file, as a suggestion
> for a good commit message. Is this no longer available in the build-in
> support?
> 2) When suing svnmerge.py for development branches it had a "merge
> everything" command (does everything automatically) that also kept track of
> the directory the branch has been made of. This does no longer seem to be
> available.
> 3) Is there any documentation that explains the differences between
> svnmerge.py and the new build-in functionality?
>
> I would love to understand if I just did not find the functionality, it is
> not yet available or it has been omitted on purpose.

The main differences are that

- svnmerge.py does whole revision only merges, it doesn't support per-file merging
- built in svn merge doesn't have a revision blocking feature
- svnmerge.py does do the log message tracking, but the svn merge log can get
this same information for you with -g

Regards,
Blair
Received on 2010-01-21 04:23:51 CET

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