Line Status Indicator (=): Reverting to the original content of the line

[web...@tigris.org]

Hi all, I'm new to resolving conflicts but think I have my head around how TortoiseMerge is showing me the information, with the exception of one thing - the = line status indicator, which the manual tells me is "A change has been undone by reverting to the original content of the line".

The thing I'm not sure of is - The original content of what line? How does TortoiseMerge know this?

As far as I've read (and can see), the top left pane is the diff between the base and theirs, top right is the diff between base and mine, and the bottom of the result of the merge so far.

So the top two panes show independant information of how they each differ from the base, yet they always seems to show these = lines in the same place, yet when comparing the base to theirs (in this case) the lines in questions shouldn't be removed as they are in both files.

Any general info on what this ine type is would be good, as I want to fully udnerstand what I'm seeing.

thanks very much,
Mike

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

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Simon Large]

2009/5/8 <web...@tigris.org>:

> Hi all, I'm new to resolving conflicts but think I have my head around how TortoiseMerge is showing me the information, with the exception of one thing - the = line status indicator, which the manual tells me is "A change has been undone by reverting to the original content of the line".
>
> The thing I'm not sure of is - The original content of what line? How does TortoiseMerge know this?
>
> As far as I've read (and can see), the top left pane is the diff between the base and theirs, top right is the diff between base and mine, and the bottom of the result of the merge so far.
>
> So the top two panes show independant information of how they each differ from the base, yet they always seems to show these = lines in the same place, yet when comparing the base to theirs (in this case) the lines in questions shouldn't be removed as they are in both files.
>
> Any general info on what this ine type is would be good, as I want to fully udnerstand what I'm seeing.

I think this is where the line has changed relative to the base, but
both mine and theirs have the *same* change relative to base, so there
is no conflict.

Did you get this when resolving conflicts from the context menu in the
update progress dialog or from the explorer context menu, Edit
conflicts? Or Check for Modifications, or somewhere else?

Simon

--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net

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

[Stefan Küng]

Simon Large wrote:
> 2009/5/8 <web...@tigris.org>:
>> Hi all, I'm new to resolving conflicts but think I have my head around how TortoiseMerge is showing me the information, with the exception of one thing - the = line status indicator, which the manual tells me is "A change has been undone by reverting to the original content of the line".
>>
>> The thing I'm not sure of is - The original content of what line? How does TortoiseMerge know this?
>>
>> As far as I've read (and can see), the top left pane is the diff between the base and theirs, top right is the diff between base and mine, and the bottom of the result of the merge so far.
>>
>> So the top two panes show independant information of how they each differ from the base, yet they always seems to show these = lines in the same place, yet when comparing the base to theirs (in this case) the lines in questions shouldn't be removed as they are in both files.
>>
>> Any general info on what this ine type is would be good, as I want to fully udnerstand what I'm seeing.
>
> I think this is where the line has changed relative to the base, but
> both mine and theirs have the *same* change relative to base, so there
> is no conflict.

Yes. But even if TMerge doesn't show a conflict there, it still could be
a conflict: if TMerge is set to ignore eols/whitespace changes, then
lines that are conflicted won't show up as conflicted if that conflict
is only due to ignored changes (eol's, whitespaces). In that case, you
would see the = lines instead.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

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

[web...@tigris.org]

Hi all, this came from using check for modifications and double clicking on the conflicts.

So, it sounds like theirs compared to the base file has used different whitespace chars from mine, so the change has been undone because its not important (according to the options I have set).

Does that sound about right?

Thanks for the help so far

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

[Lars Huttar]

Could the documentation please be updated to reflect this possible meaning of the "=" icon?
I'm in the same situation as the OP of this thread, trying to exegete what "=" means, when I'm resolving conflicts. The TortoiseSVN Help says that "=" means "A change has been undone by reverting to the original content of the line" but that's not possible, since there aren't two sequential changes involved; only two changes "in parallel" (hence the conflict). I'm guessing, with simonlarge, that 'both mine and theirs have the *same* change relative to base'. But the large gap between that interpretation and what the documentation actually says, adds a significant level of uncertainty and resulting complexity to the already complex task of merging.

> Simon Large wrote:
> > 2009/5/8 <webpost at tigris dot org>:

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