Re: svn merge on branches containing moved files/directories

On Mar 18, 2005, at 3:12 PM, Stefan Haller wrote:

> Huh? I don't see how this is any different from textual conflicts
> within a single file.

Contextual changes within a single file that had local modifications is
slightly different because those local modification have not been
committed yet. If the destination file of the merge didn't have local
modifications, but has modification that were committed in the
destination branch and there is a conflict with those committed changes
then you are right - this appears to be the same thing.

I was thinking along the lines of it not mattering that some bug was
fixed in a module that isn't needed at all anymore. The assumption
being that scope of the file delete encompasses all possible changes
that would have happened in that file, i.e. they don't matter to the
rest of the code if there is a greater change that removes the entire
file, then along with that delete must come changes to the rest of the
files that make whatever went on inside the deleted file meaningless.
But that is a flawed assumption.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 21:43:50 2005