# RE: [PATCH] git-svn: allow dcommit to retain local merge information

1 messages from 2007-06-23 to 2007-06-23. Participants: Tjernlund.
Thread: https://gitlist.dev/t/8691

## Tjernlund, 2007-06-23 17:56

Subject: RE: [PATCH] git-svn: allow dcommit to retain local merge information
Message-ID: <00e001c7b5bf$ca04ed50$0e67a8c0@Jocke>
URL: https://gitlist.dev/e/00e001c7b5bf%24ca04ed50%240e67a8c0%40Jocke

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

```