Re: [Flamerobin-checkins] SF.net SVN: flamerobin: [851] trunk/flamerobin/src/gui/CreateIndexDialog.cpp

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [Flamerobin-checkins] SF.net SVN: flamerobin: [851] trunk/flamerobin/src/gui/CreateIndexDialog.cpp

Milan Babuskov-5
Michael,

[hidden email] wrote:

> Revision: 851
> Author:   mghie
> Date:     2006-02-20 07:23:09 -0800 (Mon, 20 Feb 2006)
> ViewCVS:  http://svn.sourceforge.net/flamerobin/?rev=851&view=rev
>
> Log Message:
> -----------
> + Adds missing c_str() for wxString object in Format() call
>
> Modified Paths:
> --------------
>     trunk/flamerobin/src/gui/CreateIndexDialog.cpp
> Modified: trunk/flamerobin/src/gui/CreateIndexDialog.cpp
> ===================================================================
> (Binary files differ)

Any ideas why?

I assume your svn client marked the files as binary?

--
Milan Babuskov
http://njam.sourceforge.net
http://www.flamerobin.org



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: Re: [Flamerobin-checkins] SF.net SVN: flamerobin: [851] trunk/flamerobin/src/gui/CreateIndexDialog.cpp

Michael Hieke-2
Milan,

>> Modified: trunk/flamerobin/src/gui/CreateIndexDialog.cpp
>> ===================================================================
>> (Binary files differ)
>
> Any ideas why?
>
> I assume your svn client marked the files as binary?

there is no problem on my system.  CreateIndexDialog.* files are of
mime-type plain/text, even after I deleted them and updated from svn.
For the record, I used TortoiseSVN on Win2k, which hasn't given me any
problems yet.
Can you check the svn properties of these files in your working copy,
there should be:

svn:mime-type: plain/text
svn:keywords: Author Date Id Revision
svn:eol-style: native

Thanks

--
Michael Hieke



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: Re: [Flamerobin-checkins] SF.net SVN: flamerobin: [851] trunk/flamerobin/src/gui/CreateIndexDialog.cpp

Milan Babuskov-5
Michael Hieke wrote:

>> I assume your svn client marked the files as binary?
>
> there is no problem on my system.  CreateIndexDialog.* files are of
> mime-type plain/text, even after I deleted them and updated from svn.
> For the record, I used TortoiseSVN on Win2k, which hasn't given me any
> problems yet.
> Can you check the svn properties of these files in your working copy,
> there should be:
>
> svn:mime-type: plain/text
> svn:keywords: Author Date Id Revision
> svn:eol-style: native

Same here (on Linux). I use eSVN, but it just a GUI frontend for the
standard svn command-line client.

Let's ignore it for now, if we see more problems we'll investigate.

--
Milan Babuskov
http://njam.sourceforge.net
http://www.flamerobin.org



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel
Reply | Threaded
Open this post in threaded view
|

Re: Re: [Flamerobin-checkins] SF.net SVN: flamerobin: [851] trunk/flamerobin/src/gui/CreateIndexDialog.cpp

Michael Hieke-2
In reply to this post by Milan Babuskov-5
Milan,

Milan Babuskov wrote:

>> Modified Paths:
>> --------------
>>     trunk/flamerobin/src/gui/CreateIndexDialog.cpp
>> Modified: trunk/flamerobin/src/gui/CreateIndexDialog.cpp
>> ===================================================================
>> (Binary files differ)
>
> Any ideas why?
>
> I assume your svn client marked the files as binary?

if the same thing should happen to you with my latest commit, then I
have an explanation: svn didn't let me commit the file, as line endings
were not consistent (most probably already wrong during the svn import).
  Same thing had happened for CreateIndexDialog.cpp, IIRC.  I had to
manually correct the file, and maybe the difference between \r\n and \n
during the diff between your local copy and the file in the repository
caused the "binary files differ" message.

Thanks

--
Michael Hieke



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Flamerobin-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/flamerobin-devel