Eclipse Community Forums: Subversive » Pseudo conflicts shown when off?

Help

Home

Home » Eclipse Projects » Subversive » Pseudo conflicts shown when off?

Show: Today's Messages :: Show Polls :: Message Navigator

Pseudo conflicts shown when off? [message #537455]

Wed, 02 June 2010 14:02

David Balažic

Messages: 130
Registered: July 2009

Senior Member

In preferences / Compare/Patch I have set Show Pseudo Conflicts to off, but it seems I stil see them.

Also the last quote in some lines is colored as changed, when it is not.

See picture:

http://img17.imageshack.us/img17/7389/pseudodiff.th.png

Versions:
- Eclipse Java EE 3.5.2 - Build id: 20100218-1602
- Subversive SVN Team Provider (Incubation) 0.7.9.I20100512-1900 org.eclipse.team.svn.feature.group

Report message to a moderator

Re: Pseudo conflicts shown when off? [message #537932 is a reply to message #537455]

Fri, 04 June 2010 07:52

Igor Burilo

Messages: 435
Registered: July 2009

Senior Member

Hello David,

It's hard to say from screenshot whether you have pseudo conflict or
not. For testing, I created a very simple pseudo conflict and when I
called compare it showed correctly with enabled and disabled option.
It's better to consult Compare framework team if you are sure that you
have pseudo conflict but it's not correctly shown.

> In preferences / Compare/Patch I have set Show Pseudo Conflicts to off,
> but it seems I stil see them.
>
> Also the last quote in some lines is colored as changed, when it is not.
>
> See picture:
>
> http://img17.imageshack.us/i/pseudodiff.png/
>
> Versions:
> - Eclipse Java EE 3.5.2 - Build id: 20100218-1602
> - Subversive SVN Team Provider (Incubation) 0.7.9.I20100512-1900
> org.eclipse.team.svn.feature.group

--
Best regards,
Igor Burilo

Report message to a moderator

Re: Pseudo conflicts shown when off? [message #537939 is a reply to message #537455]

Fri, 04 June 2010 09:14

David Balažic

Messages: 130
Registered: July 2009

Senior Member

Well I just learned from the Help file what a pseudo conflict is.

A s I understand it, if my change and the change in SVN is identical, that is a pseudo conflict.

On the screenshot, the first line colored red (line 309) is the same on both sides, so that is a pseudo conflict, right?

Also line 310 is the same, but now the quote is highlighted , but again same on left and right.

I'll try to contact the Compare team too.

Report message to a moderator

Re: Pseudo conflicts shown when off? [message #538286 is a reply to message #537939]

Mon, 07 June 2010 08:35

Igor Burilo

Messages: 435
Registered: July 2009

Senior Member

Hello David,

I think it's better to ask about this in Compare team and if Subversive
does something wrong please provide details.

> Well I just learned from the Help file what a pseudo conflict is.
>
> A s I understand it, if my change and the change in SVN is identical,
> that is a pseudo conflict.
>
> On the screenshot, the first line colored red (line 309) is the same on
> both sides, so that is a pseudo conflict, right?
>
> Also line 310 is the same, but now the quote is highlighted , but again
> same on left and right.
>
> I'll try to contact the Compare team too.

--
Best regards,
Igor Burilo

Report message to a moderator

Re: Pseudo conflicts shown when off? [message #540338 is a reply to message #538286]

Tue, 15 June 2010 17:39

David Balažic

Messages: 130
Registered: July 2009

Senior Member

I posted here <http://www.eclipse.org/forums/index.php?t=msg&th=169417> but there doesn't seem to be any traffic in that group.

Is there another, better channel to Compare Team?

David

Report message to a moderator

Re: Pseudo conflicts shown when off? [message #540716 is a reply to message #540338]

Thu, 17 June 2010 07:43

Igor Burilo

Messages: 435
Registered: July 2009

Senior Member

Hello David,

I suppose that Compare component belongs to Platform, please try:
http://www.eclipse.org/forums/index.php?t=thread&frm_id= 11&

> I posted here <http://www.eclipse.org/forums/index.php?t=msg&th=169417>
> but there doesn't seem to be any traffic in that group.
>
> Is there another, better channel to Compare Team?
>
> David

--
Best regards,
Igor Burilo

Report message to a moderator

Previous Topic:	revision numbers after branching
Next Topic:	Discover WC status

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 14:37:27 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter