Having problems with message search?
Hi!
If I understand the problem correctly (and that could be doubtful!;), the repository is on a windows system and the project file for DB could be changed on either a windows system or a linux box (or even Mac: \r?). It's also my understanding that the actual interaction with subversion is done on windows (TortoiseSVN?). I don't believe using the svn propset from the command line for a single .pjd will be of much use. It would be simpler, I think, to just open specific .pjd's in 'smart' editors that afford global switching of eol for a single file (or even the old 'dos2unix/unix2dos' type utility!;). Of course this applies iff: one does it on a project file by project file basis.
If I understand the problem correctly (and that could be doubtful!;), the repository is on a windows system and the project file for DB could be changed on either a windows system or a linux box (or even Mac: \r?). It's also my understanding that the actual interaction with subversion is done on windows (TortoiseSVN?). I don't believe using the svn propset from the command line for a single .pjd will be of much use. It would be simpler, I think, to just open specific .pjd's in 'smart' editors that afford global switching of eol for a single file (or even the old 'dos2unix/unix2dos' type utility!;). Of course this applies iff: one does it on a project file by project file basis.
What I've finally gotten to work, with a certain amount of reliability (that is, I've tried it a half dozen times/ways and it didn't fail. That's not rigorous, just indicative!;) involves 2 modifications in TortoiseSVN (and probably similar in other SVN clients).
First, and foremost, svn diff is pretty crude. Which is to say, as long as you're looking at fairly plain, code type (like Pascal, C/C++, Basic, etc.) text files, it does okay. You get into anything more sophisticated (i.e., .vcproj, .pjd, misc. .xml, etc.) and it gets 'confused'. There are several free diff/merge tools out there that will probably work. The one I found and like is Source Gear's DiffMerge. One main reason I like it is that you can either let it make a SWAG at file types _or_ you can have it ask you what the type is in cases where it's not sure. For example, for a .pjd, it may well SWAG that it's an xml file (then again, maybe not). If you're not comfortable with that, or you run into problems with wrong SWAG's, set it to ask and you get a list of file types it 'knows' and you can pick (and, yes, xml is on the list!;).
Second, using propset is still useful, but in a more generic way, via the svn config file. At the very end of that file is a section on 'auto-props'. With the exception of a single line:
[auto-props]
the section is commented out. Uncommenting _and_ adding .pjd as one of the entries takes care of putting eol back to rights with SVN on Windows. That seems to be the only place that it might be a problem, and it would appear not in all places in SVN. But since it's easy enough to make all files in an SVN repository on Windows have Windows eol, it couldn't hurt!;) DB has no problems with line endings either way, it just always writes them out in 'native' no matter how they came in. If you open a .pjd that was last modified on Windows in Unix/Linux, it comes in with '\r\n', and leaves the same if no changes are made. But if changes are made it goes out with '\n'. And, of course, vice versa!;)
In synopsis:
1) In the Explorer context menu, select TortoiseSVN > Settings > External Programs. For each option for an external program, select the 'External' radio button, browse to DiffMerge and select DiffMerge.exe.
You'll find DiffMerge at:
2) In the Explorer context menu, select TortoiseSVN > Settings > General > Subversion configuration file:, and click the 'Edit' button.
You'll find, at the bottom of the file, the above mentioned section on 'auto-props'. Uncomment the lines and add the .pjd line to match the following:
enable-auto-props = yes
### Set interactive-conflicts to 'no' to disable interactive
### conflict resolution prompting. It defaults to 'yes'.
# interactive-conflicts = no
### Set interactive-conflicts to 'no' to disable interactive
### conflict resolution prompting. It defaults to 'yes'.
# interactive-conflicts = no
### Section for configuring automatic properties.
[auto-props]
### The format of the entries is:
### file-name-pattern = propname[=value][;propname[=value]...]
### The file-name-pattern can contain wildcards (such as '*' and
### '?'). All entries which match (case-insensitively) will be
### applied to the file. Note that auto-props functionality
### must be enabled, which is typically done by setting the
### 'enable-auto-props' option.
*.c = svn:eol-style=native
*.cpp = svn:eol-style=native
*.h = svn:eol-style=native
*.dsp = svn:eol-style=CRLF
*.dsw = svn:eol-style=CRLF
*.sh = svn:eol-style=native;svn:executable
*.txt = svn:eol-style=native
*.png = svn:mime-type=image/png
*.jpg = svn:mime-type=image/jpeg
Makefile = svn:eol-style=native
*.pjd=svn:eol-style=native
[auto-props]
### The format of the entries is:
### file-name-pattern = propname[=value][;propname[=value]...]
### The file-name-pattern can contain wildcards (such as '*' and
### '?'). All entries which match (case-insensitively) will be
### applied to the file. Note that auto-props functionality
### must be enabled, which is typically done by setting the
### 'enable-auto-props' option.
*.c = svn:eol-style=native
*.cpp = svn:eol-style=native
*.h = svn:eol-style=native
*.dsp = svn:eol-style=CRLF
*.dsw = svn:eol-style=CRLF
*.sh = svn:eol-style=native;svn:executable
*.txt = svn:eol-style=native
*.png = svn:mime-type=image/png
*.jpg = svn:mime-type=image/jpeg
Makefile = svn:eol-style=native
*.pjd=svn:eol-style=native
Now, it says just above this section that it's for "'svn add' and 'svn import'", but I've found, empirically, it does seem to affect other areas.
HTH:
thx,
Dave S.
wxWidgets Code Exchange
http://wxcodex.net/
----- Original Message -----
From: "Julian Smart" <julian@...>
To: <anthemion-devtools@yahoogroups.com>
Sent: Friday, April 03, 2009 11:52 AM
Subject: Re: [anthemion-devtools] Another suggestion
> Fulvio Senore wrote:
>> I think that I have finally figured out what is the problem.
>>
>> It looks like the Windows version of DialogBlocks creates the project
>> file with cr-lf line endings, while the *nix versions create the project
>> with only lf line endings.
>> This is probably the reason why subversion cannot understand that only a
>> few lines have changed. Instead it thinks that the whole file is
>> completely different.
>>
>> I will have to see if it is possible solve this problem at the
>> subversion level.
>>
> If you do this:
>
> svn propset svn:eol-style native myfile.pjd
>
> then it should use the line endings for the current operating system.
>
> Hope that solves it...
>
> Regards,
>
> Julian
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
> <*> To visit your group on the web, go to:
> http://groups.yahoo.com/group/anthemion-devtools/
>
> <*> Your email settings:
> Individual Email | Traditional
>
> <*> To change settings online go to:
> http://groups.yahoo.com/group/anthemion-devtools/join
> (Yahoo! ID required)
>
> <*> To change settings via email:
> mailto:anthemion-devtools-digest@yahoogroups.com
> mailto:anthemion-devtools-fullfeatured@yahoogroups.com
>
> <*> To unsubscribe from this group, send an email to:
> anthemion-devtools-unsubscribe@yahoogroups.com
>
> <*> Your use of Yahoo! Groups is subject to:
> http://docs.yahoo.com/info/terms/
>
http://wxcodex.net/
----- Original Message -----
From: "Julian Smart" <julian@...>
To: <anthemion-devtools@yahoogroups.com>
Sent: Friday, April 03, 2009 11:52 AM
Subject: Re: [anthemion-devtools] Another suggestion
> Fulvio Senore wrote:
>> I think that I have finally figured out what is the problem.
>>
>> It looks like the Windows version of DialogBlocks creates the project
>> file with cr-lf line endings, while the *nix versions create the project
>> with only lf line endings.
>> This is probably the reason why subversion cannot understand that only a
>> few lines have changed. Instead it thinks that the whole file is
>> completely different.
>>
>> I will have to see if it is possible solve this problem at the
>> subversion level.
>>
> If you do this:
>
> svn propset svn:eol-style native myfile.pjd
>
> then it should use the line endings for the current operating system.
>
> Hope that solves it...
>
> Regards,
>
> Julian
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
> <*> To visit your group on the web, go to:
> http://groups.yahoo.com/group/anthemion-devtools/
>
> <*> Your email settings:
> Individual Email | Traditional
>
> <*> To change settings online go to:
> http://groups.yahoo.com/group/anthemion-devtools/join
> (Yahoo! ID required)
>
> <*> To change settings via email:
> mailto:anthemion-devtools-digest@yahoogroups.com
> mailto:anthemion-devtools-fullfeatured@yahoogroups.com
>
> <*> To unsubscribe from this group, send an email to:
> anthemion-devtools-unsubscribe@yahoogroups.com
>
> <*> Your use of Yahoo! Groups is subject to:
> http://docs.yahoo.com/info/terms/
>
Offline 
Send Email