RE: Re: TortoiseMerge missing conflicts -- version information + files

> -----Original Message-----
> From: Bernhard [mailto:fraeggermann_at_yahoo.com]
> Sent: Friday, September 02, 2011 5:24 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: RE: Re: TortoiseMerge missing conflicts -- version
information
> + files
>
> > > Question/Issue 2: Why does Tortoise show conflicts in lines 256 -
> 301?? Those lines aren't different. The only difference is in line
> 255!?
> > It is three-way merge I guess you changed that block (256-301) in
> both
> > file even with most lines same.
>
> Yeah, but generally: Why does Tortoise report conflicts when the
result
> in both changes is the same?

Because Tortoise has no way of knowing whether or not the changes are
correct. Just because the lines are identical does not mean they are
correct. Here is a trivial example.

/*original code*/
char *msgs[] = {"one", "two"};

const int count = 2;

/*my changes*/
char *msgs[] = {"one", "two", "error"};

const int count = 3;

/*Your changes*/
char *msgs[] = {"one", "two", "success"};

const int count = 3;

In the first line there are obvious conflicts that resolve to something
like this

char *msgs[] = {"one", "two", "error", "success"};

Now my changes and your changes to the second line result in the exact
same code but clearly it is wrong. If Tortoise did not mark the line as
conflicted you might not notice that it should be changed to

const int count = 4;

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.

Wayne

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2834686

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-02 22:01:57 CEST