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

Re: Merge tracking implementation issue.

From: Carsten Koch <CarstenKochICEM_at_web.de>
Date: Wed, 08 Apr 2009 20:38:27 +0200

On Wed, 2009-04-08 at 14:45 +0400, Konstantin Kivi wrote:
> I understand that this new functionality is supposed to supersede svnmerge. But the way it is
> implemented does at least as much harm as good. We at our company end up routinly running scripts
> that deletes mergeinfo from files, otherwise it's not possible to work.

Same here, unfortunately.
We had tried out merge tracking on small examples
and all went well.
After we installed 1.5 and used it for a while,
we got all kinds of strange problems, up to and
including a case where "svn merge --reintegrate"
only merged one of the 2 hunks that were made
at the same time in the same file.
At that point, we created code that deleted
all svn:mergeinfo properties and stopped using
"svn merge --reintegrate".



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-08 20:40:12 CEST

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