git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git svn "error": RA layer request failed: MERGE of [path]: 200 OK

From
CSChris Shenton <chris@koansys.com>
Date
Mar 29, 2010, 12:29 UTC
Message-ID
<D73B7319-8005-4AFD-AEB4-7EF9A446D869@koansys.com>
I'm using git svn to talk to an SVN repo accessed by https.  When I try to dcommit a change I get something which appears to be an error, but if I understand the reponse code it's talking about, it seems OK:
> $ git svn dcommit
> Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...
> 	M	buildout.cfg
> RA layer request failed: MERGE of '/Svn/dha/buildout/branches/buildout_xdv': 200 OK (https://koansys.com) at /usr/local/Cellar/git/1.6.6.1/libexec/git-core/git-svn line 564
I thought this one had failed, and tried again, but it indicated doing so was a merge conflict:
> 
> $ git svn dcommit
> Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...
> Merge conflict during commit: File or directory 'buildout.cfg' is out of date; try updating: resource out of date; try updating at /usr/local/Cellar/git/1.6.6.1/libexec/git-core/git-svn line 564
Can anyone explain the first message? Is it a git problem, an svn problem, or something else?
Thanks.
Next: Eric Wong
Message 1 of 2 in “git svn "error": RA layer request failed: MERGE of [path]: 200 OK”
  1. Chris ShentonMar 29, 2010
  2. Eric WongApr 11, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.