svn commit succeeds on server, fails locally

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

svn commit succeeds on server, fails locally

eric ehlers
Hi All,

Has anyone been having problems using subversion?

For the last month or so, almost every time I commit a change, the
commit fails with the message "200 OK" similar to the following:

    Modified: erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
    Sending content:
erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
    Error: Commit failed (details follow):
    Error: MERGE request failed on
'/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++'
    Error: MERGE of
'/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++': 200 OK
(https://quantlib.svn.sourceforge.net)

After this I find that my local copy of svn thinks that the commit has
failed, whereas the repository on the server thinks that the commit
has succeeded.  If I do an svn update, svn attempts to merge changes
from the server into my local copy, finds that the files are the same,
then marks everything as up-to-date.  No email notification of my
commit is ever sent.

It appears to me that the commit itself is succeeding, and then some
subsequent operation on the back end - such as a post commit hook - is
failing.

I believe the error is unrelated to my local environment:
- I get the same error both with Tortoise SVN on Windows, and with svn
at the Linux command line
- I have tried completely deleting my local copy of the repository
followed by a fresh svn checkout
- I have updated to the latest version of svn

Has anyone had a similar problem?  Any idea what might be going wrong?

I've also reported the issue to SourceForge:
https://sourceforge.net/tracker/index.php?func=detail&aid=1763737&group_id=1&atid=200001

Regards,
Eric

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev
Reply | Threaded
Open this post in threaded view
|

Re: svn commit succeeds on server, fails locally

Ferdinando M. Ametrano-3
Hi Eric

none in my team had this problem so far...

ciao -- Nando

On 7/30/07, eric ehlers <[hidden email]> wrote:

> Hi All,
>
> Has anyone been having problems using subversion?
>
> For the last month or so, almost every time I commit a change, the
> commit fails with the message "200 OK" similar to the following:
>
>     Modified: erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
>     Sending content:
> erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
>     Error: Commit failed (details follow):
>     Error: MERGE request failed on
> '/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++'
>     Error: MERGE of
> '/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++': 200 OK
> (https://quantlib.svn.sourceforge.net)
>
> After this I find that my local copy of svn thinks that the commit has
> failed, whereas the repository on the server thinks that the commit
> has succeeded.  If I do an svn update, svn attempts to merge changes
> from the server into my local copy, finds that the files are the same,
> then marks everything as up-to-date.  No email notification of my
> commit is ever sent.
>
> It appears to me that the commit itself is succeeding, and then some
> subsequent operation on the back end - such as a post commit hook - is
> failing.
>
> I believe the error is unrelated to my local environment:
> - I get the same error both with Tortoise SVN on Windows, and with svn
> at the Linux command line
> - I have tried completely deleting my local copy of the repository
> followed by a fresh svn checkout
> - I have updated to the latest version of svn
>
> Has anyone had a similar problem?  Any idea what might be going wrong?
>
> I've also reported the issue to SourceForge:
> https://sourceforge.net/tracker/index.php?func=detail&aid=1763737&group_id=1&atid=200001
>
> Regards,
> Eric
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >>  http://get.splunk.com/
> _______________________________________________
> QuantLib-dev mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/quantlib-dev
>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev
Reply | Threaded
Open this post in threaded view
|

Re: svn commit succeeds on server, fails locally

eric ehlers
In reply to this post by eric ehlers
Hi All,

I worked out the problem, I had some directories named "C++" and
commits to these directories caused a post-commit hook on the SF
server (svnnotify) to fail, presumably because the script doesn't like
the + character.  I will rename the directories today.

Regards,
Eric

On 7/30/07, eric ehlers <[hidden email]> wrote:

> Hi All,
>
> Has anyone been having problems using subversion?
>
> For the last month or so, almost every time I commit a change, the
> commit fails with the message "200 OK" similar to the following:
>
>     Modified: erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
>     Sending content:
> erik\projects\trunk\QuantLibAddin\Clients\C++\qlxl_demo_market.xml
>     Error: Commit failed (details follow):
>     Error: MERGE request failed on
> '/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++'
>     Error: MERGE of
> '/svnroot/quantlib/trunk/QuantLibAddin/Clients/C++': 200 OK
> (https://quantlib.svn.sourceforge.net)
>
> After this I find that my local copy of svn thinks that the commit has
> failed, whereas the repository on the server thinks that the commit
> has succeeded.  If I do an svn update, svn attempts to merge changes
> from the server into my local copy, finds that the files are the same,
> then marks everything as up-to-date.  No email notification of my
> commit is ever sent.
>
> It appears to me that the commit itself is succeeding, and then some
> subsequent operation on the back end - such as a post commit hook - is
> failing.
>
> I believe the error is unrelated to my local environment:
> - I get the same error both with Tortoise SVN on Windows, and with svn
> at the Linux command line
> - I have tried completely deleting my local copy of the repository
> followed by a fresh svn checkout
> - I have updated to the latest version of svn
>
> Has anyone had a similar problem?  Any idea what might be going wrong?
>
> I've also reported the issue to SourceForge:
> https://sourceforge.net/tracker/index.php?func=detail&aid=1763737&group_id=1&atid=200001
>
> Regards,
> Eric
>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev