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

Chris Shenton [off-list ref] wrote:

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:

quoted

$ 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:

quoted

$ 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?

Hi Chris,

Did somebody commit a conflicting change to the "buildout.cfg" file?
That looks like what happened.

-- 
Eric Wong