Re: Request for Feature: svn resolved

On Dec 14, 2004, at 10:39 AM, Dale Worley wrote:

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

Conflicts don't just happen when 'svn merge' tries to patch an
already-modified file. A conflict can happen anytime a patch doesn't
apply cleanly.

If I ask 'svn merge' to compare two totally random versions of a file,
it's pretty easy to end up with a patch that doesn't apply cleanly to a
working file by the same name.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 14 18:11:27 2004