{"thread":{"id":"23229","subject":"git svn \"error\": RA layer request failed: MERGE of [path]: 200 OK","startedAt":"2010-03-29T12:29:42Z","lastAt":"2010-04-11T01:04:20Z","messageCount":2,"participants":["Chris Shenton","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"138077","messageId":"D73B7319-8005-4AFD-AEB4-7EF9A446D869@koansys.com","threadId":"23229","inReplyTo":null,"subject":"git svn \"error\": RA layer request failed: MERGE of [path]: 200 OK","fromName":"Chris Shenton","fromEmail":"chris@koansys.com","sentAt":"2010-03-29T12:29:42Z","receivedAt":"2010-03-29T12:29:42Z","isPatch":false,"sender":{"key":"chris@koansys.com","avatar":null},"body":"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:\n\n> $ git svn dcommit\n> Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...\n> \tM\tbuildout.cfg\n> 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\n\nI thought this one had failed, and tried again, but it indicated doing so was a merge conflict:\n> \n> $ git svn dcommit\n> Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...\n> 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\n\nCan anyone explain the first message? Is it a git problem, an svn problem, or something else?\n\nThanks.\n"},{"id":"139223","messageId":"20100411010420.GC22778@dcvr.yhbt.net","threadId":"23229","inReplyTo":"D73B7319-8005-4AFD-AEB4-7EF9A446D869@koansys.com","subject":"Re: git svn \"error\": RA layer request failed: MERGE of [path]: 200 OK","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-04-11T01:04:20Z","receivedAt":"2010-04-11T01:04:20Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Chris Shenton <chris@koansys.com> wrote:\n> 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:\n> \n> > $ git svn dcommit\n> > Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...\n> > \tM\tbuildout.cfg\n> > 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\n> \n> I thought this one had failed, and tried again, but it indicated doing so was a merge conflict:\n> > \n> > $ git svn dcommit\n> > Committing to https://koansys.com/svn/dha/buildout/branches/buildout_xdv ...\n> > 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\n> \n> Can anyone explain the first message? Is it a git problem, an svn problem, or something else?\n\nHi Chris,\n\nDid somebody commit a conflicting change to the \"buildout.cfg\" file?\nThat looks like what happened.\n\n-- \nEric Wong\n"}]}