Re: git-svn removes merge
On Thu, 2007-06-07 at 19:08 +0200, Joakim Tjernlund wrote:
Show 20 quoted lines
> If I do this:
>
> git checkout --track -b svn remotes/trunk
> git checkout -b merge
> git-am ../mbox
> git checkout svn
> #edit Makefile and commit
> git-svn dcommit #Note 1
> git pull . merge
> git-svn dcommit
>
> then git-svn dcommit removes the merge beteen svn and merge.
> git log svn..merge shows all the commits that git-am ../mbox added.
>
> How do I avoid this?
>
> Jocke
>
> Note 1:
> If I skip this step then the last git-svn dcommit fails, why is that?
Forgot to mention the error msg I get here:
Transaction is out of date: Out of date: '/trunk/board/tmcu/of-tmtu.dts'
in transaction '101-1' at /usr/bin/git-svn line 405
Jocke