> -----Original Message-----
> From: Bernhard [mailto:fraeggermann_at_yahoo.com]
> Sent: Friday, September 02, 2011 3:14 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: RE: Re: TortoiseMerge missing conflicts -- version
information
> + files
>
> > In general if the same line is changed by two different actions it
> > results in a conflict whether or not the changes result in identical
> > code because SVN has not way of knowing whether or not the result is
> > correct.
>
> Ok, I understand what you're saying, but I don't think SVN should care
> at all about correctness of code.
>
> SVN is not a compiler; it operates on text files. If those text files
> happen to be source code files, then it should be the responsibility
of
> the _user_ to care about correctness of the code, don't you think?
You are exactly correctly. SVN's job is to take things and keep track of
different versions. If two people changed the same part of the file it
doesn't make any assumptions about whether it is right or wrong it just
lets you know that it happened (generates a conflict) and lets you
decide.
My example was extremely trivial and both changes were in the same part
of the file. However, they might not be. If subversion automatically
merges them and doesn't generate a conflict how are you going to know it
happened? Since the 2 lines are identical diff will not show that there
was a change. You will literally have to go through all the code to
figure it out. You do not want SVN to ignore this. Most of the time it's
not a conflict but that's easy to figure out because SVN tells you
exactly where and what the issue is. If it worked the other way around
the 1% (or less) of the time when not correct you would be left
searching for a needle in a haystack and diff would not show you were
the problem is.
Wayne
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2834721
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-03 00:57:18 CEST