{"thread":{"id":"43272","subject":"git-svn and rebase causes duplicate log entries in svn","startedAt":"2006-11-14T21:49:14Z","lastAt":"2006-11-15T10:14:51Z","messageCount":3,"participants":["Joakim Tjernlund","Seth Falcon"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"294192","messageId":"00ff01c70836$ba7e3d00$1e67a8c0@Jocke","threadId":"43272","inReplyTo":null,"subject":"git-svn and rebase causes duplicate log entries in svn","fromName":"Joakim Tjernlund","fromEmail":"joakim.tjernlund@transmode.se","sentAt":"2006-11-14T21:49:14Z","receivedAt":"2006-11-14T21:49:14Z","isPatch":false,"sender":{"key":"joakim.tjernlund@transmode.se","avatar":null},"body":"I have my own u-boot tree with a local branch where I do my own development.\nThis this branch(called svn) is connected to a svn repo using git-svn.\n\nNow I want to rebase my svn branch against latest u-boot and commit\nmy rebased svn branch to svn.\n\nI use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest\nchanges and when I do so I see my local changes once more in the svn log:\n------------------------------------------------------------------------\nr321 | jocke | 2006-11-14 09:45:14 +0100 (Tue, 14 Nov 2006) | 2 lines\n\nAdd install of HRCW into I2C EEPROM.\n\nand here:\n------------------------------------------------------------------------\nr46 | jocke | 2006-11-13 19:09:19 +0100 (Mon, 13 Nov 2006) | 2 lines\n\nAdd install of HRCW into I2C EEPROM.\n\nAny way to avoid that?\n\nQuestion, I found that \n  git-svn fetch && git-rebase remotes/git-svn^2 svn\nleaves the svn branch at the tip of my latest commit in the\nsvn branch which makes better sense to me then\n  git-svn fetch && git-rebase remotes/git-svn svn\nwhich puts svn at HEAD of remotes/git-svn.\n\nAny reason I should not do the ...-svn^2 variant?\n\nI am using git 1.4.3.5 and subversion 1.4.0\n"},{"id":"298426","messageId":"m2zmatiqon.fsf@ziti.local","threadId":"43272","inReplyTo":"00ff01c70836$ba7e3d00$1e67a8c0@Jocke","subject":"Re: git-svn and rebase causes duplicate log entries in svn","fromName":"Seth Falcon","fromEmail":"sethfalcon@gmail.com","sentAt":"2006-11-14T22:55:36Z","receivedAt":"2006-11-14T22:55:36Z","isPatch":false,"sender":{"key":"sethfalcon@gmail.com","avatar":"https://gravatar.com/avatar/fd62fe73d3013b12fce71d5269ec52eaca3c4cee479efc6eea3603d6f1d8bf8d?d=mp&s=160"},"body":"Hi Joakim,\n\n\"Joakim Tjernlund\" <joakim.tjernlund@transmode.se> writes:\n> Now I want to rebase my svn branch against latest u-boot and commit\n> my rebased svn branch to svn.\n>\n> I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest\n> changes and when I do so I see my local changes once more in the svn\n> log:\n> Any way to avoid that?\n\nI think you want to use git-svn dcommit, and not commit.  See the\nnotes in the git-svn man page.  The basic workflow\nthat I've been using is:\n\ngit-svn fetch  \ngit rebase remotes/git-svn  ## on mybranch\n## make commits on mybranch\ngit-svn dcommit remotes/git-svn..mybranch\n\nThis results in each commit that I made on mybranch being sent to svn\nas a separate commit.\n\n"},{"id":"296521","messageId":"455AE89B.2030201@transmode.se","threadId":"43272","inReplyTo":"m2zmatiqon.fsf@ziti.local","subject":"Re: git-svn and rebase causes duplicate log entries in svn","fromName":"Joakim Tjernlund","fromEmail":"joakim.tjernlund@transmode.se","sentAt":"2006-11-15T10:14:51Z","receivedAt":"2006-11-15T10:14:51Z","isPatch":false,"sender":{"key":"joakim.tjernlund@transmode.se","avatar":null},"body":"Seth Falcon wrote:\n> Hi Joakim,\n>\n> \"Joakim Tjernlund\" <joakim.tjernlund@transmode.se> writes:\n>   \n>> Now I want to rebase my svn branch against latest u-boot and commit\n>> my rebased svn branch to svn.\n>>\n>> I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest\n>> changes and when I do so I see my local changes once more in the svn\n>> log:\n>> Any way to avoid that?\n>>     \n>\n> I think you want to use git-svn dcommit, and not commit.  See the\n> notes in the git-svn man page.  The basic workflow\n> that I've been using is:\n>\n> git-svn fetch  \n> git rebase remotes/git-svn  ## on mybranch\n> ## make commits on mybranch\n> git-svn dcommit remotes/git-svn..mybranch\n>\n> This results in each commit that I made on mybranch being sent to svn\n> as a separate commit.\n>\n> + seth\n>   \nThanks, but for some reson I can't make dcommit work. I just get\ngit-svn dcommit  -q remotes/git-svn..svn\nUnable to extract revision information from commit\n3643783f1f2fbdec1514b5e842e97b27622ae8b8~1\n\nMy workflow is perhaps a little diffrent I do all dev in git and then\ncommit to SVN.\nI start with creating an empty SVN tree and then do a\n   git-svn commit <commit id where my dev started from u-boot>\nthen I do a\n   git-svn commit  -q remotes/git-svn..svn\nto add all my own commits.\n"}]}