Re: Compare With -> Branch/Tag reports unexisting differences...

Mark Phippard <[email protected]> Tue, 5 May 2015 12:17:49 -0400
Newsgroups gmane.comp.version-control.subversion.subclipse.user
Message-ID <CAHFaGCpLNtVEPPOLHcm=GqYram2CsVwV0QdrrcwMNtk29VDHRg@mail.gmail.com>
------=_Part_7075_443175897.1430842672807
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

SVN diff will also include changes to SVN properties ... which you will not
see in the file compare.  So it is probably changes to something like
svn:merge info property that you are seeing.  You could do svn diff on
command line so you can see what is being output.

I seem to recall in some part of the UI, there is an option to see the
property diff with a separate option, but I do not use the feature a lot so
I do not recall where it exists and where it does not.

Mark

On Tue, May 5, 2015 at 12:12 PM, Nicolas Riendeau <[email protected]>
wrote:

> Hi!
>
> I have a weird problem I was wondering if anyone had any idea how to fix.
>
> After a merge, when we try to do a Compare With -> Branch/Tag... to
> compare with our development branch it shows files we have not modified as
> being modified.
>
> If we click on them to see the differences there does not seem to be any
> difference.
>
> If we use an outside comparison tool (in our case Beyond Compare) the
> files are reported as being identical to the binary level (ie, it's the
> same file).
>
> Is there a way to track down the cause of this problem?
>
> Is it our SVN server (1.8.1), our SVN client (Subclipse 1.10.9) or Eclipse.
>
> I/We tried with multiple versions of Eclipse (the latest one I tried was
> Luna) so if it is an Eclipse issue it has been there for a while...
>
> Everything runs under Windows so I do not think it is a line termination
> issue (and all the files we have have CRLF line terminations).
>
> Any ideas?
>
> Thank you!
>
> Nick
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3115878
>
> To unsubscribe from this discussion, e-mail: [
> [email protected]].
>



-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3115880

To unsubscribe from this discussion, e-mail: [[email protected]].
------=_Part_7075_443175897.1430842672807
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">SVN diff will also include changes to SVN properties ... w=
hich you will not see in the file compare.=C2=A0 So it is probably changes =
to something like svn:merge info property that you are seeing.=C2=A0 You co=
uld do svn diff on command line so you can see what is being output.<div><b=
r></div><div>I seem to recall in some part of the UI, there is an option to=
 see the property diff with a separate option, but I do not use the feature=
 a lot so I do not recall where it exists and where it does not.<br><div><b=
r></div><div>Mark</div></div></div><div class=3D"gmail_extra"><br><div clas=
s=3D"gmail_quote">On Tue, May 5, 2015 at 12:12 PM, Nicolas Riendeau <span d=
ir=3D"ltr">&lt;<a href=3D"mailto:[email protected]" target=3D"_blank">for=
[email protected]</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote"=
 style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi=
!<br>
<br>
I have a weird problem I was wondering if anyone had any idea how to fix.<b=
r>
<br>
After a merge, when we try to do a Compare With -&gt; Branch/Tag... to comp=
are with our development branch it shows files we have not modified as bein=
g modified.<br>
<br>
If we click on them to see the differences there does not seem to be any di=
fference.<br>
<br>
If we use an outside comparison tool (in our case Beyond Compare) the files=
 are reported as being identical to the binary level (ie, it&#39;s the same=
 file).<br>
<br>
Is there a way to track down the cause of this problem?<br>
<br>
Is it our SVN server (1.8.1), our SVN client (Subclipse 1.10.9) or Eclipse.=
<br>
<br>
I/We tried with multiple versions of Eclipse (the latest one I tried was Lu=
na) so if it is an Eclipse issue it has been there for a while...<br>
<br>
Everything runs under Windows so I do not think it is a line termination is=
sue (and all the files we have have CRLF line terminations).<br>
<br>
Any ideas?<br>
<br>
Thank you!<br>
<br>
Nick<br>
<br>
------------------------------------------------------<br>
<a href=3D"http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=3D1047&a=
mp;dsMessageId=3D3115878" target=3D"_blank">http://subclipse.tigris.org/ds/=
viewMessage.do?dsForumId=3D1047&amp;dsMessageId=3D3115878</a><br>
<br>
To unsubscribe from this discussion, e-mail: [<a href=3D"mailto:users-unsub=
[email protected]">[email protected]</a>].<b=
r>
</blockquote></div><br><br clear=3D"all"><div><br></div>-- <br><div class=
=3D"gmail_signature">Thanks<br><br>Mark Phippard<br><a href=3D"http://markp=
hip.blogspot.com/" target=3D"_blank">http://markphip.blogspot.com/</a></div=
>
</div>

------=_Part_7075_443175897.1430842672807--