{"thread":{"id":"8691","subject":"RE: [PATCH] git-svn: allow dcommit to retain local merge information","startedAt":"2007-06-23T17:56:12Z","lastAt":"2007-06-23T17:56:12Z","messageCount":1,"participants":["Tjernlund"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"45616","messageId":"00e001c7b5bf$ca04ed50$0e67a8c0@Jocke","threadId":"8691","inReplyTo":null,"subject":"RE: [PATCH] git-svn: allow dcommit to retain local merge information","fromName":"Tjernlund","fromEmail":"tjernlund@tjernlund.se","sentAt":"2007-06-23T17:56:12Z","receivedAt":"2007-06-23T17:56:12Z","isPatch":true,"sender":{"key":"tjernlund@tjernlund.se","avatar":null},"body":"> > $ echo post-merge trunk change >> trunk/testfile1\n> > $ svn commit -m \"trunk change after merge\"\n> > $ echo post-merge conflicting change >> trunk/testfile2\n> > $ svn commit -m \"trunk change with conflict\"\n> > $ cd ../gitclone\n> > $ git-svn fetch\n> > $ git merge -m \"change with conflict\" trunk\n> > \n> > Conflict, as expected\n> > \n> > $ vi testfile2\n> > $ git add testfile2\n> > $ git commit\n> > $ git-svn dcommit\n> > Transaction is out of date: Out of date: '/trunk/testfile1' in \n> > transaction '9-1' at /Users/koreth/git/git-svn line 398\n> \n> Maybe this can help?\n> http://svn.haxx.se/subusers/archive-2005-02/0096.shtml\n> http://subclipse.tigris.org/faq.html#out-of-date\n\nCould this be related to do_update vs. do_switch?\nLatest subversion appears to have a working\ndo_switch function.   \n\n\nJocke\n"}]}