You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/06/07 11:05:01 UTC
svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Author: jleroux
Date: Mon Jun 7 09:05:00 2010
New Revision: 952156
URL: http://svn.apache.org/viewvc?rev=952156&view=rev
Log:
May help sometimes
Added:
ofbiz/branches/release09.04/revert.bat (with props)
Added: ofbiz/branches/release09.04/revert.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
==============================================================================
--- ofbiz/branches/release09.04/revert.bat (added)
+++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
@@ -0,0 +1,23 @@
+echo off
+rem #####################################################################
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem #####################################################################
+
+rem to revert back a revision in local copy.
+echo on
+svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
Propchange: ofbiz/branches/release09.04/revert.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Posted by Jacques Le Roux <ja...@les7arts.com>.
Anyway, done at r952278
Jacques
From: "Jacques Le Roux" <ja...@les7arts.com>
> Mmm... actually I thought that I had not to worry about that, since it's included into the subversion config file.
> http://ofbiz.apache.org/svn/config
>
> There I read
> *.dsp = svn:eol-style=CRLF
> *.bat = svn:eol-style=CRLF
> *.dsw = svn:eol-style=CRLF
> *.sh = svn:eol-style=LF;svn:executable;svn:keywords="Date Rev Author URL Id"
>
> I wonder now why it did not work automatically, and also if we should not have the same properties for .bat than for .sh
>
> Jacques
>
> From: "Adrian Crum" <ad...@hlmksw.com>
> To: <de...@ofbiz.apache.org>
> Sent: Monday, June 07, 2010 4:57 PM
> Subject: Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
>
>
>> It was my understanding that our svn clients should be configured to set
>> all text files to eol-style:native. Why would this file be any different?
>>
>> -Adrian
>>
>> On 6/7/2010 7:53 AM, Jacques Le Roux wrote:
>>> Why? It's only used locally and shoud not be modified, do you see a
>>> reason? (same for 10.04 branch)
>>>
>>> Jacques
>>>
>>> From: "Adrian Crum" <ad...@hlmksw.com>
>>>> Shouldn't the eol-style property be set to native?
>>>>
>>>> -Adrian
>>>>
>>>> On 6/7/2010 2:05 AM, jleroux@apache.org wrote:
>>>>> Author: jleroux
>>>>> Date: Mon Jun 7 09:05:00 2010
>>>>> New Revision: 952156
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=952156&view=rev
>>>>> Log:
>>>>> May help sometimes
>>>>>
>>>>> Added:
>>>>> ofbiz/branches/release09.04/revert.bat (with props)
>>>>>
>>>>> Added: ofbiz/branches/release09.04/revert.bat
>>>>> URL:
>>>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
>>>>>
>>>>> ==============================================================================
>>>>>
>>>>> --- ofbiz/branches/release09.04/revert.bat (added)
>>>>> +++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
>>>>> @@ -0,0 +1,23 @@
>>>>> +echo off
>>>>> +rem
>>>>> #####################################################################
>>>>> +rem Licensed to the Apache Software Foundation (ASF) under one
>>>>> +rem or more contributor license agreements. See the NOTICE file
>>>>> +rem distributed with this work for additional information
>>>>> +rem regarding copyright ownership. The ASF licenses this file
>>>>> +rem to you under the Apache License, Version 2.0 (the
>>>>> +rem "License"); you may not use this file except in compliance
>>>>> +rem with the License. You may obtain a copy of the License at
>>>>> +rem
>>>>> +rem http://www.apache.org/licenses/LICENSE-2.0
>>>>> +rem
>>>>> +rem Unless required by applicable law or agreed to in writing,
>>>>> +rem software distributed under the License is distributed on an
>>>>> +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>>>> +rem KIND, either express or implied. See the License for the
>>>>> +rem specific language governing permissions and limitations
>>>>> +rem under the License.
>>>>> +rem
>>>>> #####################################################################
>>>>> +
>>>>> +rem to revert back a revision in local copy.
>>>>> +echo on
>>>>> +svn merge -c -%1
>>>>> https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
>>>>>
>>>>> Propchange: ofbiz/branches/release09.04/revert.bat
>>>>> ------------------------------------------------------------------------------
>>>>>
>>>>> svn:eol-style = CRLF
>>>>>
>>>>>
>>>>>
>>>>
>>>
>>>
>>
>
Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Posted by Jacques Le Roux <ja...@les7arts.com>.
Mmm... actually I thought that I had not to worry about that, since it's included into the subversion config file.
http://ofbiz.apache.org/svn/config
There I read
*.dsp = svn:eol-style=CRLF
*.bat = svn:eol-style=CRLF
*.dsw = svn:eol-style=CRLF
*.sh = svn:eol-style=LF;svn:executable;svn:keywords="Date Rev Author URL Id"
I wonder now why it did not work automatically, and also if we should not have the same properties for .bat than for .sh
Jacques
From: "Adrian Crum" <ad...@hlmksw.com>
To: <de...@ofbiz.apache.org>
Sent: Monday, June 07, 2010 4:57 PM
Subject: Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
> It was my understanding that our svn clients should be configured to set
> all text files to eol-style:native. Why would this file be any different?
>
> -Adrian
>
> On 6/7/2010 7:53 AM, Jacques Le Roux wrote:
>> Why? It's only used locally and shoud not be modified, do you see a
>> reason? (same for 10.04 branch)
>>
>> Jacques
>>
>> From: "Adrian Crum" <ad...@hlmksw.com>
>>> Shouldn't the eol-style property be set to native?
>>>
>>> -Adrian
>>>
>>> On 6/7/2010 2:05 AM, jleroux@apache.org wrote:
>>>> Author: jleroux
>>>> Date: Mon Jun 7 09:05:00 2010
>>>> New Revision: 952156
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=952156&view=rev
>>>> Log:
>>>> May help sometimes
>>>>
>>>> Added:
>>>> ofbiz/branches/release09.04/revert.bat (with props)
>>>>
>>>> Added: ofbiz/branches/release09.04/revert.bat
>>>> URL:
>>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
>>>>
>>>> ==============================================================================
>>>>
>>>> --- ofbiz/branches/release09.04/revert.bat (added)
>>>> +++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
>>>> @@ -0,0 +1,23 @@
>>>> +echo off
>>>> +rem
>>>> #####################################################################
>>>> +rem Licensed to the Apache Software Foundation (ASF) under one
>>>> +rem or more contributor license agreements. See the NOTICE file
>>>> +rem distributed with this work for additional information
>>>> +rem regarding copyright ownership. The ASF licenses this file
>>>> +rem to you under the Apache License, Version 2.0 (the
>>>> +rem "License"); you may not use this file except in compliance
>>>> +rem with the License. You may obtain a copy of the License at
>>>> +rem
>>>> +rem http://www.apache.org/licenses/LICENSE-2.0
>>>> +rem
>>>> +rem Unless required by applicable law or agreed to in writing,
>>>> +rem software distributed under the License is distributed on an
>>>> +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>>> +rem KIND, either express or implied. See the License for the
>>>> +rem specific language governing permissions and limitations
>>>> +rem under the License.
>>>> +rem
>>>> #####################################################################
>>>> +
>>>> +rem to revert back a revision in local copy.
>>>> +echo on
>>>> +svn merge -c -%1
>>>> https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
>>>>
>>>> Propchange: ofbiz/branches/release09.04/revert.bat
>>>> ------------------------------------------------------------------------------
>>>>
>>>> svn:eol-style = CRLF
>>>>
>>>>
>>>>
>>>
>>
>>
>
Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Posted by Adrian Crum <ad...@hlmksw.com>.
It was my understanding that our svn clients should be configured to set
all text files to eol-style:native. Why would this file be any different?
-Adrian
On 6/7/2010 7:53 AM, Jacques Le Roux wrote:
> Why? It's only used locally and shoud not be modified, do you see a
> reason? (same for 10.04 branch)
>
> Jacques
>
> From: "Adrian Crum" <ad...@hlmksw.com>
>> Shouldn't the eol-style property be set to native?
>>
>> -Adrian
>>
>> On 6/7/2010 2:05 AM, jleroux@apache.org wrote:
>>> Author: jleroux
>>> Date: Mon Jun 7 09:05:00 2010
>>> New Revision: 952156
>>>
>>> URL: http://svn.apache.org/viewvc?rev=952156&view=rev
>>> Log:
>>> May help sometimes
>>>
>>> Added:
>>> ofbiz/branches/release09.04/revert.bat (with props)
>>>
>>> Added: ofbiz/branches/release09.04/revert.bat
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
>>>
>>> ==============================================================================
>>>
>>> --- ofbiz/branches/release09.04/revert.bat (added)
>>> +++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
>>> @@ -0,0 +1,23 @@
>>> +echo off
>>> +rem
>>> #####################################################################
>>> +rem Licensed to the Apache Software Foundation (ASF) under one
>>> +rem or more contributor license agreements. See the NOTICE file
>>> +rem distributed with this work for additional information
>>> +rem regarding copyright ownership. The ASF licenses this file
>>> +rem to you under the Apache License, Version 2.0 (the
>>> +rem "License"); you may not use this file except in compliance
>>> +rem with the License. You may obtain a copy of the License at
>>> +rem
>>> +rem http://www.apache.org/licenses/LICENSE-2.0
>>> +rem
>>> +rem Unless required by applicable law or agreed to in writing,
>>> +rem software distributed under the License is distributed on an
>>> +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +rem KIND, either express or implied. See the License for the
>>> +rem specific language governing permissions and limitations
>>> +rem under the License.
>>> +rem
>>> #####################################################################
>>> +
>>> +rem to revert back a revision in local copy.
>>> +echo on
>>> +svn merge -c -%1
>>> https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
>>>
>>> Propchange: ofbiz/branches/release09.04/revert.bat
>>> ------------------------------------------------------------------------------
>>>
>>> svn:eol-style = CRLF
>>>
>>>
>>>
>>
>
>
Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Posted by Jacques Le Roux <ja...@les7arts.com>.
Why? It's only used locally and shoud not be modified, do you see a reason? (same for 10.04 branch)
Jacques
From: "Adrian Crum" <ad...@hlmksw.com>
> Shouldn't the eol-style property be set to native?
>
> -Adrian
>
> On 6/7/2010 2:05 AM, jleroux@apache.org wrote:
>> Author: jleroux
>> Date: Mon Jun 7 09:05:00 2010
>> New Revision: 952156
>>
>> URL: http://svn.apache.org/viewvc?rev=952156&view=rev
>> Log:
>> May help sometimes
>>
>> Added:
>> ofbiz/branches/release09.04/revert.bat (with props)
>>
>> Added: ofbiz/branches/release09.04/revert.bat
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
>> ==============================================================================
>> --- ofbiz/branches/release09.04/revert.bat (added)
>> +++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
>> @@ -0,0 +1,23 @@
>> +echo off
>> +rem #####################################################################
>> +rem Licensed to the Apache Software Foundation (ASF) under one
>> +rem or more contributor license agreements. See the NOTICE file
>> +rem distributed with this work for additional information
>> +rem regarding copyright ownership. The ASF licenses this file
>> +rem to you under the Apache License, Version 2.0 (the
>> +rem "License"); you may not use this file except in compliance
>> +rem with the License. You may obtain a copy of the License at
>> +rem
>> +rem http://www.apache.org/licenses/LICENSE-2.0
>> +rem
>> +rem Unless required by applicable law or agreed to in writing,
>> +rem software distributed under the License is distributed on an
>> +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> +rem KIND, either express or implied. See the License for the
>> +rem specific language governing permissions and limitations
>> +rem under the License.
>> +rem #####################################################################
>> +
>> +rem to revert back a revision in local copy.
>> +echo on
>> +svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
>>
>> Propchange: ofbiz/branches/release09.04/revert.bat
>> ------------------------------------------------------------------------------
>> svn:eol-style = CRLF
>>
>>
>>
>
Re: svn commit: r952156 - /ofbiz/branches/release09.04/revert.bat
Posted by Adrian Crum <ad...@hlmksw.com>.
Shouldn't the eol-style property be set to native?
-Adrian
On 6/7/2010 2:05 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Mon Jun 7 09:05:00 2010
> New Revision: 952156
>
> URL: http://svn.apache.org/viewvc?rev=952156&view=rev
> Log:
> May help sometimes
>
> Added:
> ofbiz/branches/release09.04/revert.bat (with props)
>
> Added: ofbiz/branches/release09.04/revert.bat
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/revert.bat?rev=952156&view=auto
> ==============================================================================
> --- ofbiz/branches/release09.04/revert.bat (added)
> +++ ofbiz/branches/release09.04/revert.bat Mon Jun 7 09:05:00 2010
> @@ -0,0 +1,23 @@
> +echo off
> +rem #####################################################################
> +rem Licensed to the Apache Software Foundation (ASF) under one
> +rem or more contributor license agreements. See the NOTICE file
> +rem distributed with this work for additional information
> +rem regarding copyright ownership. The ASF licenses this file
> +rem to you under the Apache License, Version 2.0 (the
> +rem "License"); you may not use this file except in compliance
> +rem with the License. You may obtain a copy of the License at
> +rem
> +rem http://www.apache.org/licenses/LICENSE-2.0
> +rem
> +rem Unless required by applicable law or agreed to in writing,
> +rem software distributed under the License is distributed on an
> +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +rem KIND, either express or implied. See the License for the
> +rem specific language governing permissions and limitations
> +rem under the License.
> +rem #####################################################################
> +
> +rem to revert back a revision in local copy.
> +echo on
> +svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/branches/release09.04
>
> Propchange: ofbiz/branches/release09.04/revert.bat
> ------------------------------------------------------------------------------
> svn:eol-style = CRLF
>
>
>