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

RE: Request for Feature: svn resolved

From: Dale Worley <dworley_at_pingtel.com>
Date: 2004-12-14 17:39:49 CET

From: Michael Klemm [mailto:michael.klemm@informatik.uni-erlangen.de]
> I've got a little proposal to extend the features of "svn resolved".
> When merging with some branches we get conflicts of files that were
> never touched inside the destination for the merge.

It seems to me that you've got a bug here. If a file was not changed on one
leg of the merge, svn should never report a conflict for it.

OTOH, it may be that some change has been made, albeit in an obscure way.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 14 17:42:12 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.