Henry Minsky | 1 Jun 23:09
Picon

anyone know what svn is trying to tell me here?

I get this error when trying to run svn-commit on a changeset


hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
$ svn-commit
Sending        build-tools/findtests.js
Sending        build-tools/findtests.sh
Adding         build-tools/findtestsbrowser.sh
Sending        build.xml
Adding         test/lztest/browser.txt
Adding         test/lztest/lztest-lpp-2958.lzx
Adding         test/lztest/rhino.txt
Deleting       test/lztest/smoketest.txt
Transmitting file data ......svn: Commit failed (details follow):
svn: MERGE request failed on '/openlaszlo/branches/legals'
svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (http://svn.openlaszlo.org)

When I run svn status, it does not list any conflicts though ...
I did an svn up, and it does not complain either.


--
Henry Minsky
Software Architect
hminsky <at> laszlosystems.com

P T Withington | 2 Jun 18:48
Favicon

Re: anyone know what svn is trying to tell me here?

Are you using TortiseSVN?

http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit-hook- 
script-is-not-being-displayed-by-1.4.0-clients-t2398547.html

On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:

> I get this error when trying to run svn-commit on a changeset
>
>
> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>> $ svn-commit
>> Sending        build-tools/findtests.js
>> Sending        build-tools/findtests.sh
>> Adding         build-tools/findtestsbrowser.sh
>> Sending        build.xml
>> Adding         test/lztest/browser.txt
>> Adding         test/lztest/lztest-lpp-2958.lzx
>> Adding         test/lztest/rhino.txt
>> Deleting       test/lztest/smoketest.txt
>> Transmitting file data ......svn: Commit failed (details follow):
>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>> http://svn.openlaszlo.org)
>>
>
> When I run svn status, it does not list any conflicts though ...
> I did an svn up, and it does not complain either.
>
>
> -- 
> Henry Minsky
> Software Architect
> hminsky <at> laszlosystems.com

Benjamin Shine | 3 Jun 00:43
Favicon

Re: anyone know what svn is trying to tell me here?

I always get this error when I try to svn-commit when I have an add- 
with-history. I have not found a way around it; I end up throwing  
away the history.

-ben

On Jun 2, 2007, at 9:48 AM, P T Withington wrote:

> Are you using TortiseSVN?
>
> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit- 
> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>
> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>
>> I get this error when trying to run svn-commit on a changeset
>>
>>
>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>> $ svn-commit
>>> Sending        build-tools/findtests.js
>>> Sending        build-tools/findtests.sh
>>> Adding         build-tools/findtestsbrowser.sh
>>> Sending        build.xml
>>> Adding         test/lztest/browser.txt
>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>> Adding         test/lztest/rhino.txt
>>> Deleting       test/lztest/smoketest.txt
>>> Transmitting file data ......svn: Commit failed (details follow):
>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>> http://svn.openlaszlo.org)
>>>
>>
>> When I run svn status, it does not list any conflicts though ...
>> I did an svn up, and it does not complain either.
>>
>>
>> -- 
>> Henry Minsky
>> Software Architect
>> hminsky <at> laszlosystems.com
>

Benjamin Shine
Software Engineer, Open Laszlo / Laszlo Systems
ben <at> laszlosystems.com

P T Withington | 3 Jun 02:50
Favicon

Re: anyone know what svn is trying to tell me here?

Same question for you then, what client are you using?

It's sad to have to throw away history (I assume you mean you are  
moving and then editing?)

On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:

> I always get this error when I try to svn-commit when I have an add- 
> with-history. I have not found a way around it; I end up throwing  
> away the history.
>
> -ben
>
> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>
>> Are you using TortiseSVN?
>>
>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit- 
>> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>>
>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>
>>> I get this error when trying to run svn-commit on a changeset
>>>
>>>
>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>> $ svn-commit
>>>> Sending        build-tools/findtests.js
>>>> Sending        build-tools/findtests.sh
>>>> Adding         build-tools/findtestsbrowser.sh
>>>> Sending        build.xml
>>>> Adding         test/lztest/browser.txt
>>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>>> Adding         test/lztest/rhino.txt
>>>> Deleting       test/lztest/smoketest.txt
>>>> Transmitting file data ......svn: Commit failed (details follow):
>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>> http://svn.openlaszlo.org)
>>>>
>>>
>>> When I run svn status, it does not list any conflicts though ...
>>> I did an svn up, and it does not complain either.
>>>
>>>
>>> -- 
>>> Henry Minsky
>>> Software Architect
>>> hminsky <at> laszlosystems.com
>>
>
> Benjamin Shine
> Software Engineer, Open Laszlo / Laszlo Systems
> ben <at> laszlosystems.com
>
>
>

Benjamin Shine | 4 Jun 19:40
Favicon

Re: anyone know what svn is trying to tell me here?


svn, version 1.4.0 (r21228)

Yep, I'm moving and then editing.

On Jun 2, 2007, at 5:50 PM, P T Withington wrote:

> Same question for you then, what client are you using?
>
> It's sad to have to throw away history (I assume you mean you are  
> moving and then editing?)
>
> On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:
>
>> I always get this error when I try to svn-commit when I have an  
>> add-with-history. I have not found a way around it; I end up  
>> throwing away the history.
>>
>> -ben
>>
>> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>>
>>> Are you using TortiseSVN?
>>>
>>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit- 
>>> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>>>
>>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>>
>>>> I get this error when trying to run svn-commit on a changeset
>>>>
>>>>
>>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>>> $ svn-commit
>>>>> Sending        build-tools/findtests.js
>>>>> Sending        build-tools/findtests.sh
>>>>> Adding         build-tools/findtestsbrowser.sh
>>>>> Sending        build.xml
>>>>> Adding         test/lztest/browser.txt
>>>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>>>> Adding         test/lztest/rhino.txt
>>>>> Deleting       test/lztest/smoketest.txt
>>>>> Transmitting file data ......svn: Commit failed (details follow):
>>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>>> http://svn.openlaszlo.org)
>>>>>
>>>>
>>>> When I run svn status, it does not list any conflicts though ...
>>>> I did an svn up, and it does not complain either.
>>>>
>>>>
>>>> -- 
>>>> Henry Minsky
>>>> Software Architect
>>>> hminsky <at> laszlosystems.com
>>>
>>
>> Benjamin Shine
>> Software Engineer, Open Laszlo / Laszlo Systems
>> ben <at> laszlosystems.com
>>
>>
>>
>

Benjamin Shine
Software Engineer, Open Laszlo / Laszlo Systems
ben <at> laszlosystems.com

P T Withington | 4 Jun 19:58
Favicon

Re: anyone know what svn is trying to tell me here?

Huh.  Well I am using:

Subversion command-line client, version 1.3.1.

and don't see this issue.  Googling seems to indicate it is an issue  
with 1.4 clients.

On 2007-06-04, at 13:40 EDT, Benjamin Shine wrote:

>
> svn, version 1.4.0 (r21228)
>
> Yep, I'm moving and then editing.
>
> On Jun 2, 2007, at 5:50 PM, P T Withington wrote:
>
>> Same question for you then, what client are you using?
>>
>> It's sad to have to throw away history (I assume you mean you are  
>> moving and then editing?)
>>
>> On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:
>>
>>> I always get this error when I try to svn-commit when I have an  
>>> add-with-history. I have not found a way around it; I end up  
>>> throwing away the history.
>>>
>>> -ben
>>>
>>> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>>>
>>>> Are you using TortiseSVN?
>>>>
>>>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit- 
>>>> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>>>>
>>>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>>>
>>>>> I get this error when trying to run svn-commit on a changeset
>>>>>
>>>>>
>>>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>>>> $ svn-commit
>>>>>> Sending        build-tools/findtests.js
>>>>>> Sending        build-tools/findtests.sh
>>>>>> Adding         build-tools/findtestsbrowser.sh
>>>>>> Sending        build.xml
>>>>>> Adding         test/lztest/browser.txt
>>>>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>>>>> Adding         test/lztest/rhino.txt
>>>>>> Deleting       test/lztest/smoketest.txt
>>>>>> Transmitting file data ......svn: Commit failed (details follow):
>>>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>>>> http://svn.openlaszlo.org)
>>>>>>
>>>>>
>>>>> When I run svn status, it does not list any conflicts though ...
>>>>> I did an svn up, and it does not complain either.
>>>>>
>>>>>
>>>>> -- 
>>>>> Henry Minsky
>>>>> Software Architect
>>>>> hminsky <at> laszlosystems.com
>>>>
>>>
>>> Benjamin Shine
>>> Software Engineer, Open Laszlo / Laszlo Systems
>>> ben <at> laszlosystems.com
>>>
>>>
>>>
>>
>
> Benjamin Shine
> Software Engineer, Open Laszlo / Laszlo Systems
> ben <at> laszlosystems.com
>
>
>

Benjamin Shine | 4 Jun 20:01
Favicon

Re: anyone know what svn is trying to tell me here?

Drat. Isn't software supposed to get *better* with later releases?

On Jun 4, 2007, at 10:58 AM, P T Withington wrote:

> Huh.  Well I am using:
>
> Subversion command-line client, version 1.3.1.
>
> and don't see this issue.  Googling seems to indicate it is an  
> issue with 1.4 clients.
>
> On 2007-06-04, at 13:40 EDT, Benjamin Shine wrote:
>
>>
>> svn, version 1.4.0 (r21228)
>>
>> Yep, I'm moving and then editing.
>>
>> On Jun 2, 2007, at 5:50 PM, P T Withington wrote:
>>
>>> Same question for you then, what client are you using?
>>>
>>> It's sad to have to throw away history (I assume you mean you are  
>>> moving and then editing?)
>>>
>>> On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:
>>>
>>>> I always get this error when I try to svn-commit when I have an  
>>>> add-with-history. I have not found a way around it; I end up  
>>>> throwing away the history.
>>>>
>>>> -ben
>>>>
>>>> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>>>>
>>>>> Are you using TortiseSVN?
>>>>>
>>>>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit- 
>>>>> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>>>>>
>>>>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>>>>
>>>>>> I get this error when trying to run svn-commit on a changeset
>>>>>>
>>>>>>
>>>>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>>>>> $ svn-commit
>>>>>>> Sending        build-tools/findtests.js
>>>>>>> Sending        build-tools/findtests.sh
>>>>>>> Adding         build-tools/findtestsbrowser.sh
>>>>>>> Sending        build.xml
>>>>>>> Adding         test/lztest/browser.txt
>>>>>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>>>>>> Adding         test/lztest/rhino.txt
>>>>>>> Deleting       test/lztest/smoketest.txt
>>>>>>> Transmitting file data ......svn: Commit failed (details  
>>>>>>> follow):
>>>>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>>>>> http://svn.openlaszlo.org)
>>>>>>>
>>>>>>
>>>>>> When I run svn status, it does not list any conflicts though ...
>>>>>> I did an svn up, and it does not complain either.
>>>>>>
>>>>>>
>>>>>> -- 
>>>>>> Henry Minsky
>>>>>> Software Architect
>>>>>> hminsky <at> laszlosystems.com
>>>>>
>>>>
>>>> Benjamin Shine
>>>> Software Engineer, Open Laszlo / Laszlo Systems
>>>> ben <at> laszlosystems.com
>>>>
>>>>
>>>>
>>>
>>
>> Benjamin Shine
>> Software Engineer, Open Laszlo / Laszlo Systems
>> ben <at> laszlosystems.com
>>
>>
>>
>

Benjamin Shine
Software Engineer, Open Laszlo / Laszlo Systems
ben <at> laszlosystems.com

P T Withington | 4 Jun 20:08
Favicon

Re: anyone know what svn is trying to tell me here?

I dunno, maybe our server needs to be upgraded to play nice with the  
later clients?

On 2007-06-04, at 14:01 EDT, Benjamin Shine wrote:

> Drat. Isn't software supposed to get *better* with later releases?
>
> On Jun 4, 2007, at 10:58 AM, P T Withington wrote:
>
>> Huh.  Well I am using:
>>
>> Subversion command-line client, version 1.3.1.
>>
>> and don't see this issue.  Googling seems to indicate it is an  
>> issue with 1.4 clients.
>>
>> On 2007-06-04, at 13:40 EDT, Benjamin Shine wrote:
>>
>>>
>>> svn, version 1.4.0 (r21228)
>>>
>>> Yep, I'm moving and then editing.
>>>
>>> On Jun 2, 2007, at 5:50 PM, P T Withington wrote:
>>>
>>>> Same question for you then, what client are you using?
>>>>
>>>> It's sad to have to throw away history (I assume you mean you  
>>>> are moving and then editing?)
>>>>
>>>> On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:
>>>>
>>>>> I always get this error when I try to svn-commit when I have an  
>>>>> add-with-history. I have not found a way around it; I end up  
>>>>> throwing away the history.
>>>>>
>>>>> -ben
>>>>>
>>>>> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>>>>>
>>>>>> Are you using TortiseSVN?
>>>>>>
>>>>>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre- 
>>>>>> commit-hook-script-is-not-being-displayed-by-1.4.0-clients- 
>>>>>> t2398547.html
>>>>>>
>>>>>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>>>>>
>>>>>>> I get this error when trying to run svn-commit on a changeset
>>>>>>>
>>>>>>>
>>>>>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>>>>>> $ svn-commit
>>>>>>>> Sending        build-tools/findtests.js
>>>>>>>> Sending        build-tools/findtests.sh
>>>>>>>> Adding         build-tools/findtestsbrowser.sh
>>>>>>>> Sending        build.xml
>>>>>>>> Adding         test/lztest/browser.txt
>>>>>>>> Adding         test/lztest/lztest-lpp-2958.lzx
>>>>>>>> Adding         test/lztest/rhino.txt
>>>>>>>> Deleting       test/lztest/smoketest.txt
>>>>>>>> Transmitting file data ......svn: Commit failed (details  
>>>>>>>> follow):
>>>>>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>>>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>>>>>> http://svn.openlaszlo.org)
>>>>>>>>
>>>>>>>
>>>>>>> When I run svn status, it does not list any conflicts though ...
>>>>>>> I did an svn up, and it does not complain either.
>>>>>>>
>>>>>>>
>>>>>>> -- 
>>>>>>> Henry Minsky
>>>>>>> Software Architect
>>>>>>> hminsky <at> laszlosystems.com
>>>>>>
>>>>>
>>>>> Benjamin Shine
>>>>> Software Engineer, Open Laszlo / Laszlo Systems
>>>>> ben <at> laszlosystems.com
>>>>>
>>>>>
>>>>>
>>>>
>>>
>>> Benjamin Shine
>>> Software Engineer, Open Laszlo / Laszlo Systems
>>> ben <at> laszlosystems.com
>>>
>>>
>>>
>>
>
> Benjamin Shine
> Software Engineer, Open Laszlo / Laszlo Systems
> ben <at> laszlosystems.com
>
>
>

Henry Minsky | 3 Jun 03:36
Picon

Re: anyone know what svn is trying to tell me here?

I'm using cygwin svn v1.4.3


On 6/2/07, P T Withington <ptw <at> openlaszlo.org> wrote:
Same question for you then, what client are you using?

It's sad to have to throw away history (I assume you mean you are
moving and then editing?)

On 2007-06-02, at 18:43 EDT, Benjamin Shine wrote:

> I always get this error when I try to svn-commit when I have an add-
> with-history. I have not found a way around it; I end up throwing
> away the history.
>
> -ben
>
> On Jun 2, 2007, at 9:48 AM, P T Withington wrote:
>
>> Are you using TortiseSVN?
>>
>> http://www.nabble.com/REPOST:-BUG:-Error-output-from-pre-commit-
>> hook-script-is-not-being-displayed-by-1.4.0-clients-t2398547.html
>>
>> On 2007-06-01, at 17:09 EDT, Henry Minsky wrote:
>>
>>> I get this error when trying to run svn-commit on a changeset
>>>
>>>
>>> hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
>>>> $ svn-commit
>>>> Sending        build-tools/findtests.js
>>>> Sending        build-tools/findtests.sh
>>>> Adding         build-tools/findtestsbrowser.sh
>>>> Sending        build.xml
>>>> Adding         test/lztest/browser.txt
>>>> Adding         test/lztest/lztest- lpp-2958.lzx
>>>> Adding         test/lztest/rhino.txt
>>>> Deleting       test/lztest/smoketest.txt
>>>> Transmitting file data ......svn: Commit failed (details follow):
>>>> svn: MERGE request failed on '/openlaszlo/branches/legals'
>>>> svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (
>>>> http://svn.openlaszlo.org)
>>>>
>>>
>>> When I run svn status, it does not list any conflicts though ...
>>> I did an svn up, and it does not complain either.
>>>
>>>
>>> --
>>> Henry Minsky
>>> Software Architect
>>> hminsky <at> laszlosystems.com
>>
>
> Benjamin Shine
> Software Engineer, Open Laszlo / Laszlo Systems
> ben <at> laszlosystems.com
>
>
>




--
Henry Minsky
Software Architect
hminsky <at> laszlosystems.com


Gmane