Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
I can modify the config file in Tortoise either via Settings then use the Edit button, or directly with Notepad. I notice that the file from SourceForge has Unix-style line-ends (i.e. just x'0A' rather than the Windows x'0D0A'). Do you know if I can use the Unix version on Windows, or do I have to make all the line-ends Windows ones first? If you haven't met this problemette before, then please don't spend any time on it - I'll just convert it to Windows format with a little oorexx program... Thanks, Oliver -Original Message- From: Mark Miesfeld [mailto:miesf...@gmail.com] Sent: 19 February 2012 19:15 To: Open Object Rexx Developer Mailing List Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos. On Sun, Feb 19, 2012 at 10:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. You should have choosen 'accept theirs' The files you commit are not getting the svn properties set correctly. I've been meaning to bring this up with you, but haven't had time. I fixed some of them in the commit you reference. I think the problem is your are not using a proper svn config file. You need to check out this URL: https://oorexx.svn.sourceforge.net/svnroot/oorexx/svnconfig which is just 1 file: config Then you need to replace the svn config file on your system with this file. You might need to search the TortiseSVN help to find out where the file goes. On my system, when I run as Administrator the file goes: C:\Users\Administrator\AppData\Roaming\Subversion Directory of C:\Users\Administrator\AppData\Roaming\Subversion 10/06/2011 04:05 PM 6,549 config Just copy the checked out file over the top of the existing file. If you do not see a config file at that location, then look in the TortiseSVN help to see where they keep the file. Next, we'll need to set all the svn properties on the files you checked in to the correct property. Just adding the correct file will not update the properties on files already in the repository. It will just set the properties on future files that you check in properly, automatically. The existing files will have to be done manually. Here is an example: C:\main\samples\windows\oodialogsvn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialogcd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn proplist -v * Properties on 'bmp': svn:ignore Thumbs.db bugtraq:number true C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:eol-style native *.h property 'svn:eol-style' set on 'OrderFormView.h' property 'svn:eol-style' set on 'OrderListView.h' property 'svn:eol-style' set on 'OrderView.h' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:executable 1 *.rex property 'svn:executable' set on 'OrderFormView.rex' property 'svn:executable' set on 'OrderListView.rex' property 'svn:executable' set on 'OrderModelData.rex' property 'svn:executable' set on 'OrderView.rex' property 'svn:executable' set on 'StartupOrder.rex' property 'svn:executable' set on 'StartupOrderForm.rex' property 'svn:executable' set on 'StartupOrderList.rex' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order All text files need the native eol property. All .rex files also need the executable property I'm not sure how you do that in TortoiseSVN, but it has to be similar to how you do it in the command line version. -- Mark Miesfeld -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
If you haven't met this problemette before, then please don't
spend any time on it - I'll just convert it to Windows format
with a little oorexx program...
It's a one-liner:
/* Change LF to CRLF in a file */
call changefile arg(1) '/'||'0a'x'/'||'0d0a'x
assuming you have changefile (which can now be shortened by using changestr):
/* ChangeAll in a file or files */
-- Syntax: changefile spec pattern
--
-- Where:
--
-- spec is file-specification or wildcard (no blanks)
-- Add /s to the spec-word to include subdirectories
--
-- pattern is (for example) /fred/bert to change 'fred' to 'bert'
-- Where the delimiter character '/' is any character; the
-- first character of word 2
--
-- Example:
--
-- changefile *.html /old text/new text string
--
-- If pattern is omitted then you will be prompted for the old and
-- new strings (use this to includeetc., in the strings)
--
-- Blanks are not allowed because of command line risks (trailing
-- blanks, etc.). Use a backquote (`) for a blank, in a pattern,
-- or omit the pattern for prompts.
-- [Later maybe use URL encoding .. %20, etc.]
parse arg spec change
change=strip(change)
parse var change delim +1 old (delim) new
if spec='' then do
say 'Enter file specification (may include wildcards):'
parse pull spec
end
subdirs=0 -- subdirectories flag
if pos('/s',spec)0 then do
parse var spec pre '/s' post
spec=pre''post
subdirs=1
end
if spec='' then do
say 'No specification, so no change'
exit; end
if old='' then do -- prompt please
say 'Enter old (source) string:'
parse pull old
if old=='' then do
say 'Empty old string not allowed -- exiting'
exit; end
say 'Enter new (target) string:'
parse pull new
end
else do -- pattern supplied
if pos(' ', old)0 | pos(' ', new)0 then do
say 'blanks detected; unsafe change -- exiting'
exit
end
old=translate(strip(old), ' ', '`')
new=translate(strip(new), ' ', '`')
end
if old==new then do
say 'New and old strings identical -- exiting'
exit; end
-- build the list of files; currently no /s
sftopts='FL'
if subdirs then sftopts=sftopts'S'
call sysfiletree spec, 'LIST', sftopts
files=list.0
if files=0 then do
say 'No files match 'spec''
exit; end
say 'Changing' spec '('files') from 'old' to 'new'...'
if files1 then do
say 'Enter Y to confirm, anything else to quit'
pull ans
if left(ans,1)\='Y' then exit
end
do f=1 to files
parse var list.f date time size . qfile/* may have blanks.. */
if size=0 then iterate f
file=strip(qfile) /* else leading blank */
-- say file''' to update'
doc=charin(file, 1, chars(file))
call charout file
doc=change(doc, old, new)
if changed0 then do
backfile=file'.'date('s')
'@copy' file backfile 'nul' -- backup
if rc0 then exit rc
call sysfiledelete file
call charout file, doc, 1
if result\=0 then do
say '***' result 'characters could not be written to: '''file
say '*** backup should still be on disk: '''backfile
exit
end
call charout file
if changed=1 then add='one change'; else add=changed 'changes'
say file''' updated ['add']'
call sysfiledelete backfile
end
end f
exit
/* Internal function: CHANGE(string,old,new) */
/* */
/* (Like XEDIT C/old/new/1 *) */
/* */
/* Changes all occurrences of old in string to new. */
/* If old=='', then new is prefixed to string. MFC */
Change: procedure expose changed
parse arg string, old, new
if old=='' then do; changed=1; return new||string; end
out=''; changed=0
do while pos(old,string)\=0
parse var string prefix (old) string
out=out||prefix||new
changed=changed+1
end
return out||string
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
Many thanks, Mike. That saved me quite a bit of mucking around.
Atb,
Oliver
PS: I think there's a teeny bugette at line 70 which is:
-- build the list of files; currently no /s sftopts='FL'
I changed this to:
-- build the list of files; currently no /s
sftopts='FL'
And all was fine.
-Original Message-
From: Mike Cowlishaw [mailto:m...@speleotrove.com]
Sent: 20 February 2012 14:03
To: 'Open Object Rexx Developer Mailing List'
Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
If you haven't met this problemette before, then please don't spend
any time on it - I'll just convert it to Windows format with a little
oorexx program...
It's a one-liner:
/* Change LF to CRLF in a file */
call changefile arg(1) '/'||'0a'x'/'||'0d0a'x
assuming you have changefile (which can now be shortened by using
changestr):
/* ChangeAll in a file or files */
-- Syntax: changefile spec pattern
--
-- Where:
--
-- spec is file-specification or wildcard (no blanks)
-- Add /s to the spec-word to include subdirectories
--
-- pattern is (for example) /fred/bert to change 'fred' to 'bert'
-- Where the delimiter character '/' is any character; the
-- first character of word 2
--
-- Example:
--
-- changefile *.html /old text/new text string
--
-- If pattern is omitted then you will be prompted for the old and
-- new strings (use this to includeetc., in the strings)
--
-- Blanks are not allowed because of command line risks (trailing
-- blanks, etc.). Use a backquote (`) for a blank, in a pattern,
-- or omit the pattern for prompts.
-- [Later maybe use URL encoding .. %20, etc.]
parse arg spec change
change=strip(change)
parse var change delim +1 old (delim) new
if spec='' then do
say 'Enter file specification (may include wildcards):'
parse pull spec
end
subdirs=0 -- subdirectories flag
if pos('/s',spec)0 then do
parse var spec pre '/s' post
spec=pre''post
subdirs=1
end
if spec='' then do
say 'No specification, so no change'
exit; end
if old='' then do -- prompt please
say 'Enter old (source) string:'
parse pull old
if old=='' then do
say 'Empty old string not allowed -- exiting'
exit; end
say 'Enter new (target) string:'
parse pull new
end
else do -- pattern supplied
if pos(' ', old)0 | pos(' ', new)0 then do
say 'blanks detected; unsafe change -- exiting'
exit
end
old=translate(strip(old), ' ', '`')
new=translate(strip(new), ' ', '`')
end
if old==new then do
say 'New and old strings identical -- exiting'
exit; end
-- build the list of files; currently no /s sftopts='FL'
if subdirs then sftopts=sftopts'S'
call sysfiletree spec, 'LIST', sftopts
files=list.0
if files=0 then do
say 'No files match 'spec''
exit; end
say 'Changing' spec '('files') from 'old' to 'new'...'
if files1 then do
say 'Enter Y to confirm, anything else to quit'
pull ans
if left(ans,1)\='Y' then exit
end
do f=1 to files
parse var list.f date time size . qfile/* may have blanks.. */
if size=0 then iterate f
file=strip(qfile) /* else leading blank */
-- say file''' to update'
doc=charin(file, 1, chars(file))
call charout file
doc=change(doc, old, new)
if changed0 then do
backfile=file'.'date('s')
'@copy' file backfile 'nul' -- backup
if rc0 then exit rc
call sysfiledelete file
call charout file, doc, 1
if result\=0 then do
say '***' result 'characters could not be written to: '''file
say '*** backup should still be on disk: '''backfile
exit
end
call charout file
if changed=1 then add='one change'; else add=changed 'changes'
say file''' updated ['add']'
call sysfiledelete backfile
end
end f
exit
/* Internal function: CHANGE(string,old,new) */
/* */
/* (Like XEDIT C/old/new/1 *) */
/* */
/* Changes all occurrences of old in string to new. */
/* If old=='', then new is prefixed to string. MFC */
Change: procedure expose changed
parse arg string, old, new
if old=='' then do; changed=1; return new||string; end
out=''; changed=0
do while pos(old,string)\=0
parse var string prefix (old) string
out=out||prefix||new
changed=changed+1
end
return out||string
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers is
just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro
Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Oorexx-devel mailing
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
Many thanks, Mike. That saved me quite a bit of mucking around. You're welcome ... PS: I think there's a teeny bugette at line 70 which is: -- build the list of files; currently no /s sftopts='FL' I changed this to: -- build the list of files; currently no /s sftopts='FL' And all was fine. It's correct in my original .rex ... must have been artifact of cut-and-paste or my e-mail sender or your e-mail receiver. Or something in-between. sigh Mike -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
For what it's worth, my copy and paste from gmail worked fine... On Mon, Feb 20, 2012 at 10:13 AM, Mike Cowlishaw m...@speleotrove.comwrote: Many thanks, Mike. That saved me quite a bit of mucking around. You're welcome ... PS: I think there's a teeny bugette at line 70 which is: -- build the list of files; currently no /s sftopts='FL' I changed this to: -- build the list of files; currently no /s sftopts='FL' And all was fine. It's correct in my original .rex ... must have been artifact of cut-and-paste or my e-mail sender or your e-mail receiver. Or something in-between. sigh Mike -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel -- OREXXMan -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
On Mon, Feb 20, 2012 at 4:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I can modify the config file in Tortoise either via Settings then use the Edit button, or directly with Notepad. I notice that the file from SourceForge has Unix-style line-ends (i.e. just x'0A' rather than the Windows x'0D0A'). Oliver, the file is stored somewhere. You want to copy our config file over the top of the TortiseSVN file, where ever it is. Most likely it is under AppData for your user ID, if you are on Windows 7. -- Mark Miesfeld -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
Oliver, A little reseach showed me that TortoiseSVN uses a subversion command line client to do its work. So, you want to replace the subversion config file with our file. The location of that file is, on Windows 7, where I first indicated. If you can not locate the file, let me know what platform you are on and we can figure out where it is. -- Mark Miesfeld On Mon, Feb 20, 2012 at 4:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I can modify the config file in Tortoise either via Settings then use the Edit button, or directly with Notepad. I notice that the file from SourceForge has Unix-style line-ends (i.e. just x'0A' rather than the Windows x'0D0A'). Do you know if I can use the Unix version on Windows, or do I have to make all the line-ends Windows ones first? If you haven't met this problemette before, then please don't spend any time on it - I'll just convert it to Windows format with a little oorexx program... Thanks, Oliver -Original Message- From: Mark Miesfeld [mailto:miesf...@gmail.com] Sent: 19 February 2012 19:15 To: Open Object Rexx Developer Mailing List Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos. On Sun, Feb 19, 2012 at 10:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. You should have choosen 'accept theirs' The files you commit are not getting the svn properties set correctly. I've been meaning to bring this up with you, but haven't had time. I fixed some of them in the commit you reference. I think the problem is your are not using a proper svn config file. You need to check out this URL: https://oorexx.svn.sourceforge.net/svnroot/oorexx/svnconfig which is just 1 file: config Then you need to replace the svn config file on your system with this file. You might need to search the TortiseSVN help to find out where the file goes. On my system, when I run as Administrator the file goes: C:\Users\Administrator\AppData\Roaming\Subversion Directory of C:\Users\Administrator\AppData\Roaming\Subversion 10/06/2011 04:05 PM 6,549 config Just copy the checked out file over the top of the existing file. If you do not see a config file at that location, then look in the TortiseSVN help to see where they keep the file. Next, we'll need to set all the svn properties on the files you checked in to the correct property. Just adding the correct file will not update the properties on files already in the repository. It will just set the properties on future files that you check in properly, automatically. The existing files will have to be done manually. Here is an example: C:\main\samples\windows\oodialogsvn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialogcd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn proplist -v * Properties on 'bmp': svn:ignore Thumbs.db bugtraq:number true C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:eol-style native *.h property 'svn:eol-style' set on 'OrderFormView.h' property 'svn:eol-style' set on 'OrderListView.h' property 'svn:eol-style' set on 'OrderView.h' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:executable 1 *.rex property 'svn:executable' set on 'OrderFormView.rex' property 'svn:executable' set on 'OrderListView.rex' property 'svn:executable' set on 'OrderModelData.rex' property 'svn:executable' set on 'OrderView.rex' property 'svn:executable' set on 'StartupOrder.rex' property 'svn:executable' set on 'StartupOrderForm.rex' property 'svn:executable' set on 'StartupOrderList.rex' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order All text files need the native eol property. All .rex files also need the executable property I'm not sure how you do that in TortoiseSVN, but it has to be similar to how you do it in the command line version. -- Mark Miesfeld -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
Oliver, Sorry to post so many times ... You should be able to locate the config by just using: dir %APPDATA%\subversion from the command line, like so: C:\work.ooRexx\wc\ooTest\4.1.0dir %APPDATA%\subversion Volume in drive C is Win7 Volume Serial Number is D25E-50D5 Directory of C:\Users\Administrator\AppData\Roaming\subversion 09/25/2011 10:00 AMDIR . 09/25/2011 10:00 AMDIR .. 09/25/2011 10:00 AMDIR auth 10/06/2011 04:05 PM 6,549 config 09/25/2011 10:00 AM 4,400 README.txt 09/25/2011 10:00 AM 7,832 servers 3 File(s) 18,781 bytes 3 Dir(s) 4,973,355,008 bytes free C:\work.ooRexx\wc\ooTest\4.1.0 Then just copy the config file you check out from out repository ovet the top of that file. -- Mark Miesfeld On Mon, Feb 20, 2012 at 4:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I can modify the config file in Tortoise either via Settings then use the Edit button, or directly with Notepad. I notice that the file from SourceForge has Unix-style line-ends (i.e. just x'0A' rather than the Windows x'0D0A'). Do you know if I can use the Unix version on Windows, or do I have to make all the line-ends Windows ones first? If you haven't met this problemette before, then please don't spend any time on it - I'll just convert it to Windows format with a little oorexx program... Thanks, Oliver -Original Message- From: Mark Miesfeld [mailto:miesf...@gmail.com] Sent: 19 February 2012 19:15 To: Open Object Rexx Developer Mailing List Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos. On Sun, Feb 19, 2012 at 10:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. You should have choosen 'accept theirs' The files you commit are not getting the svn properties set correctly. I've been meaning to bring this up with you, but haven't had time. I fixed some of them in the commit you reference. I think the problem is your are not using a proper svn config file. You need to check out this URL: https://oorexx.svn.sourceforge.net/svnroot/oorexx/svnconfig which is just 1 file: config Then you need to replace the svn config file on your system with this file. You might need to search the TortiseSVN help to find out where the file goes. On my system, when I run as Administrator the file goes: C:\Users\Administrator\AppData\Roaming\Subversion Directory of C:\Users\Administrator\AppData\Roaming\Subversion 10/06/2011 04:05 PM 6,549 config Just copy the checked out file over the top of the existing file. If you do not see a config file at that location, then look in the TortiseSVN help to see where they keep the file. Next, we'll need to set all the svn properties on the files you checked in to the correct property. Just adding the correct file will not update the properties on files already in the repository. It will just set the properties on future files that you check in properly, automatically. The existing files will have to be done manually. Here is an example: C:\main\samples\windows\oodialogsvn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialogcd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn proplist -v * Properties on 'bmp': svn:ignore Thumbs.db bugtraq:number true C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:eol-style native *.h property 'svn:eol-style' set on 'OrderFormView.h' property 'svn:eol-style' set on 'OrderListView.h' property 'svn:eol-style' set on 'OrderView.h' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:executable 1 *.rex property 'svn:executable' set on 'OrderFormView.rex' property 'svn:executable' set on 'OrderListView.rex' property 'svn:executable' set on 'OrderModelData.rex' property 'svn:executable' set on 'OrderView.rex' property 'svn:executable' set on 'StartupOrder.rex' property 'svn:executable' set on 'StartupOrderForm.rex' property 'svn:executable' set on 'StartupOrderList.rex' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order All text files need the native eol property. All .rex files also need the executable property I'm not sure how you do that in TortoiseSVN, but it has to be similar to how you do it in the command line version. -- Mark Miesfeld
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
OK, I've got the proper config file loaded up, and have downloaded the command line SVN provided as part of Tortoise (I just didn't include it at install-time before). Btw, I've also found out how to set properties with the GUI version - but only one file at time it appears. A couple of questions if I may: (1) I understand that I should set properties on all the files whose types appear under [auto-props] in the config file - and of course that I should set them to the values shown in the config file. Is this correct? (2) Does this mean that I should NOT have any file types that are NOT shown in the config file? (3) Do other properties that are already set count? For example, on one bmp file I looked at the property is: svn:mime-type application/octet-stream. However, the config file says bmp is svn:mime-type=image/bmp. Is it OK just to add the latter? Or should I ensure that the only properties set are those shown under [auto-props] in the config file? (4) Finally, is it only Exercise06 I need to fix? Or should I check elsewhere (I've recently updated a couple of files from earlier exercises)? Many thanks. --Oliver PS: Btw, I assume it's the build tools that use these properties. Does anything else use them? -Original Message- From: Mark Miesfeld [mailto:miesf...@gmail.com] Sent: 19 February 2012 19:15 To: Open Object Rexx Developer Mailing List Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos. On Sun, Feb 19, 2012 at 10:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. You should have choosen 'accept theirs' The files you commit are not getting the svn properties set correctly. I've been meaning to bring this up with you, but haven't had time. I fixed some of them in the commit you reference. I think the problem is your are not using a proper svn config file. You need to check out this URL: https://oorexx.svn.sourceforge.net/svnroot/oorexx/svnconfig which is just 1 file: config Then you need to replace the svn config file on your system with this file. You might need to search the TortiseSVN help to find out where the file goes. On my system, when I run as Administrator the file goes: C:\Users\Administrator\AppData\Roaming\Subversion Directory of C:\Users\Administrator\AppData\Roaming\Subversion 10/06/2011 04:05 PM 6,549 config Just copy the checked out file over the top of the existing file. If you do not see a config file at that location, then look in the TortiseSVN help to see where they keep the file. Next, we'll need to set all the svn properties on the files you checked in to the correct property. Just adding the correct file will not update the properties on files already in the repository. It will just set the properties on future files that you check in properly, automatically. The existing files will have to be done manually. Here is an example: C:\main\samples\windows\oodialogsvn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialogcd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn proplist -v * Properties on 'bmp': svn:ignore Thumbs.db bugtraq:number true C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:eol-style native *.h property 'svn:eol-style' set on 'OrderFormView.h' property 'svn:eol-style' set on 'OrderListView.h' property 'svn:eol-style' set on 'OrderView.h' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:executable 1 *.rex property 'svn:executable' set on 'OrderFormView.rex' property 'svn:executable' set on 'OrderListView.rex' property 'svn:executable' set on 'OrderModelData.rex' property 'svn:executable' set on 'OrderView.rex' property 'svn:executable' set on 'StartupOrder.rex' property 'svn:executable' set on 'StartupOrderForm.rex' property 'svn:executable' set on 'StartupOrderList.rex' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order All text files need the native eol property. All .rex files also need the executable property I'm not sure how you do that in TortoiseSVN, but it has to be similar to how you do it in the command line version. -- Mark Miesfeld -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
On Mon, Feb 20, 2012 at 9:01 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: OK, I've got the proper config file loaded up, and have downloaded the command line SVN provided as part of Tortoise (I just didn't include it at install-time before). Btw, I've also found out how to set properties with the GUI version - but only one file at time it appears. A couple of questions if I may: Oliver, you're making this way more complicated than it need be. ;-) The answer to all your questions is: just leave every thing alone. The config file will ensure that any new files you commit will have the properties automatically set to match what we wanted for the project. I'll take a look at the existing files and fix anything that needs it. (1) I understand that I should set properties on all the files whose types appear under [auto-props] in the config file - and of course that I should set them to the values shown in the config file. Is this correct? No, not really. Just leave the existing files alone. When you commit any new file, things will automatically be done correctly, you don't need to think about it. (2) Does this mean that I should NOT have any file types that are NOT shown in the config file? No, it just means the default for that type of file is fine. You don't need to think about it. (3) Do other properties that are already set count? For example, on one bmp file I looked at the property is: svn:mime-type application/octet-stream. However, the config file says bmp is svn:mime-type=image/bmp. Is it OK just to add the latter? Or should I ensure that the only properties set are those shown under [auto-props] in the config file? No, just leave everything alone, it'll be fine. (4) Finally, is it only Exercise06 I need to fix? Or should I check elsewhere (I've recently updated a couple of files from earlier exercises)? Don't worry about it. From now on, when you commit a new file, things will be set correctly. That's all we need at this point. PS: Btw, I assume it's the build tools that use these properties. Does anything else use them? Not realy. It just ensures that if someone checks the files out on Linux, or Mac, etc.. they get the proper line setting. -- Mark Miesfeld -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
OK, I no touch. Thanks. -Original Message- From: Mark Miesfeld [mailto:miesf...@gmail.com] Sent: 20 February 2012 17:25 To: Open Object Rexx Developer Mailing List Subject: Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos. On Mon, Feb 20, 2012 at 9:01 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: OK, I've got the proper config file loaded up, and have downloaded the command line SVN provided as part of Tortoise (I just didn't include it at install-time before). Btw, I've also found out how to set properties with the GUI version - but only one file at time it appears. A couple of questions if I may: Oliver, you're making this way more complicated than it need be. ;-) The answer to all your questions is: just leave every thing alone. The config file will ensure that any new files you commit will have the properties automatically set to match what we wanted for the project. I'll take a look at the existing files and fix anything that needs it. (1) I understand that I should set properties on all the files whose types appear under [auto-props] in the config file - and of course that I should set them to the values shown in the config file. Is this correct? No, not really. Just leave the existing files alone. When you commit any new file, things will automatically be done correctly, you don't need to think about it. (2) Does this mean that I should NOT have any file types that are NOT shown in the config file? No, it just means the default for that type of file is fine. You don't need to think about it. (3) Do other properties that are already set count? For example, on one bmp file I looked at the property is: svn:mime-type application/octet-stream. However, the config file says bmp is svn:mime-type=image/bmp. Is it OK just to add the latter? Or should I ensure that the only properties set are those shown under [auto-props] in the config file? No, just leave everything alone, it'll be fine. (4) Finally, is it only Exercise06 I need to fix? Or should I check elsewhere (I've recently updated a couple of files from earlier exercises)? Don't worry about it. From now on, when you commit a new file, things will be set correctly. That's all we need at this point. PS: Btw, I assume it's the build tools that use these properties. Does anything else use them? Not realy. It just ensures that if someone checks the files out on Linux, or Mac, etc.. they get the proper line setting. -- Mark Miesfeld -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
[Oorexx-devel] ooDialog Guide - Possible conflict in repos.
Hi Mark, I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. Revision: 7528 Author: miesfeld Date: 14 February 2012 04:31:09 Message: first attempt at straightening out props on ooDialog UserGuide files Modified : /main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer /CustomerListView.rex Modified : /main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer /CustomerModelData.rex Modified : /main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer /CustomerView.rex Modified : /main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer /StartupCustomer.rex Modified : /main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer /StartupCustomerList.rex Atb, Oliver -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
Re: [Oorexx-devel] ooDialog Guide - Possible conflict in repos.
On Sun, Feb 19, 2012 at 10:38 AM, Oliver Sims oliver.s...@simsassociates.co.uk wrote: I just tried to commit some files and got a conflict (listed below). I resolved it using mine because I couldn't see any changes that were in your files but not in mine - I could only see my changes. Then I committed (rev 7553). Hope I haven't over-written anything. You should have choosen 'accept theirs' The files you commit are not getting the svn properties set correctly. I've been meaning to bring this up with you, but haven't had time. I fixed some of them in the commit you reference. I think the problem is your are not using a proper svn config file. You need to check out this URL: https://oorexx.svn.sourceforge.net/svnroot/oorexx/svnconfig which is just 1 file: config Then you need to replace the svn config file on your system with this file. You might need to search the TortiseSVN help to find out where the file goes. On my system, when I run as Administrator the file goes: C:\Users\Administrator\AppData\Roaming\Subversion Directory of C:\Users\Administrator\AppData\Roaming\Subversion 10/06/2011 04:05 PM 6,549 config Just copy the checked out file over the top of the existing file. If you do not see a config file at that location, then look in the TortiseSVN help to see where they keep the file. Next, we'll need to set all the svn properties on the files you checked in to the correct property. Just adding the correct file will not update the properties on files already in the repository. It will just set the properties on future files that you check in properly, automatically. The existing files will have to be done manually. Here is an example: C:\main\samples\windows\oodialogsvn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialogcd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn proplist -v * Properties on 'bmp': svn:ignore Thumbs.db bugtraq:number true C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:eol-style native *.h property 'svn:eol-style' set on 'OrderFormView.h' property 'svn:eol-style' set on 'OrderListView.h' property 'svn:eol-style' set on 'OrderView.h' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Ordersvn propset svn:executable 1 *.rex property 'svn:executable' set on 'OrderFormView.rex' property 'svn:executable' set on 'OrderListView.rex' property 'svn:executable' set on 'OrderModelData.rex' property 'svn:executable' set on 'OrderView.rex' property 'svn:executable' set on 'StartupOrder.rex' property 'svn:executable' set on 'StartupOrderForm.rex' property 'svn:executable' set on 'StartupOrderList.rex' C:\main\samples\windows\oodialog\userGuide\exercises\Exercise06\Order All text files need the native eol property. All .rex files also need the executable property I'm not sure how you do that in TortoiseSVN, but it has to be similar to how you do it in the command line version. -- Mark Miesfeld -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ Oorexx-devel mailing list Oorexx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oorexx-devel
