> > $ echo post-merge trunk change >> trunk/testfile1 > > $ svn commit -m "trunk change after merge" > > $ echo post-merge conflicting change >> trunk/testfile2 > > $ svn commit -m "trunk change with conflict" > > $ cd ../gitclone > > $ git-svn fetch > > $ git merge -m "change with conflict" trunk > > > > Conflict, as expected > > > > $ vi testfile2 > > $ git add testfile2 > > $ git commit > > $ git-svn dcommit > > Transaction is out of date: Out of date: '/trunk/testfile1' in > > transaction '9-1' at /Users/koreth/git/git-svn line 398 > > Maybe this can help? > http://svn.haxx.se/subusers/archive-2005-02/0096.shtml > http://subclipse.tigris.org/faq.html#out-of-date Could this be related to do_update vs. do_switch? Latest subversion appears to have a working do_switch function. Jocke - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
