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\oodialog>svn proplist -v calculator.rex Properties on 'calculator.rex': svn:executable * svn:eol-style native C:\main\samples\windows\oodialog>cd userGuide\exercises\Exercise06\Order C:\samples\windows\oodialog\userGuide\exercises\Exercise06\Order>svn 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\Order>svn 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\Order>svn 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
