{"thread":{"id":"8485","subject":"git-svn removes merge","startedAt":"2007-06-07T17:08:16Z","lastAt":"2007-06-08T13:52:21Z","messageCount":2,"participants":["Joakim Tjernlund"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"44251","messageId":"1181236096.30670.66.camel@gentoo-jocke.transmode.se","threadId":"8485","inReplyTo":null,"subject":"git-svn removes merge","fromName":"Joakim Tjernlund","fromEmail":"joakim.tjernlund@transmode.se","sentAt":"2007-06-07T17:08:16Z","receivedAt":"2007-06-07T17:08:16Z","isPatch":false,"sender":{"key":"joakim.tjernlund@transmode.se","avatar":null},"body":"If I do this:\n\ngit checkout --track -b svn remotes/trunk\ngit checkout -b merge\ngit-am ../mbox\ngit checkout svn\n#edit Makefile and commit\ngit-svn dcommit #Note 1\ngit pull . merge\ngit-svn dcommit\n\nthen git-svn dcommit removes the merge beteen svn and merge.\ngit log svn..merge shows all the commits that git-am ../mbox added.\n\nHow do I avoid this?\n\n Jocke\n\nNote 1:\n  If I skip this step then the last git-svn dcommit fails, why is that?\n"},{"id":"44352","messageId":"1181310741.30670.92.camel@gentoo-jocke.transmode.se","threadId":"8485","inReplyTo":"1181236096.30670.66.camel@gentoo-jocke.transmode.se","subject":"Re: git-svn removes merge","fromName":"Joakim Tjernlund","fromEmail":"joakim.tjernlund@transmode.se","sentAt":"2007-06-08T13:52:21Z","receivedAt":"2007-06-08T13:52:21Z","isPatch":false,"sender":{"key":"joakim.tjernlund@transmode.se","avatar":null},"body":"On Thu, 2007-06-07 at 19:08 +0200, Joakim Tjernlund wrote:\n> If I do this:\n> \n> git checkout --track -b svn remotes/trunk\n> git checkout -b merge\n> git-am ../mbox\n> git checkout svn\n> #edit Makefile and commit\n> git-svn dcommit #Note 1\n> git pull . merge\n> git-svn dcommit\n> \n> then git-svn dcommit removes the merge beteen svn and merge.\n> git log svn..merge shows all the commits that git-am ../mbox added.\n> \n> How do I avoid this?\n> \n>  Jocke\n> \n> Note 1:\n>   If I skip this step then the last git-svn dcommit fails, why is that?\n     Forgot to mention the error msg I get here:\nTransaction is out of date: Out of date: '/trunk/board/tmcu/of-tmtu.dts'\nin transaction '101-1' at /usr/bin/git-svn line 405\n\n Jocke\n"}]}