[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: Stein Somers <ssomers_at_opnet.com>
Date: Wed, 20 Jan 2010 16:20:57 +0100

I haven't used svnmerge.py

On 20/01/2010 8:04, Dieter Oberkofler wrote:
> 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.

That seems like a workaround for the lack of support by tools. Now that
mergeinfo is standard, if you use for instance TSVN, you can
(optionally) drill down to the log messages of merged changesets. So the
log message of a merge can be to the point: it's a merge. If you want
detail of what was merged, let the SVN browser get it for you.

> 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.

I would certainly like that: the default merge source could be the
branch that the working copy's URL is a copy of. So "svn merge" would
suffice. But then there are situation where you merge from a different
branch, or where the merge source has been renamed (bad practice, I know).

-- 
Stein
Received on 2010-01-20 16:21:32 CET

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