{"thread":{"id":"17448","subject":"question re dcommit problem","startedAt":"2009-01-30T00:14:08Z","lastAt":"2009-01-30T21:43:54Z","messageCount":3,"participants":["David Mann","Nico -telmich- Schottelius","Thomas Rast"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"102529","messageId":"49824650.2070209@epstudiossoftware.com","threadId":"17448","inReplyTo":null,"subject":"question re dcommit problem","fromName":"David Mann","fromEmail":"mannd@epstudiossoftware.com","sentAt":"2009-01-30T00:14:08Z","receivedAt":"2009-01-30T00:14:08Z","isPatch":false,"sender":{"key":"mannd@epstudiossoftware.com","avatar":null},"body":"I created a git repository from my svn repository, later uploaded it to\nGitHub, and after some branching and merging, can no longer dcommit back\nto the svn repository.  I notice that somewhere along the way the\ngit-svn-id: messages no longer appear on my master branch.  When I try\nto git svn dcommit I get weird messages like this:\n\nmannd@SuperSluggo:~/dev/git/epsimulator> git svn dcommit\nCommitting to\nhttps://epsimulator.svn.sourceforge.net/svnroot/epsimulator/epsimulator/trunk\n...\nFilesystem has no item: File not found: transaction '435-24', path\n'/epsimulator/trunk/epsimulator.kdevses' at\n/home/mannd/libexec/git-core/git-svn line 480\n\nAny way to fix this?  If not, I will just abandon SVN and stick with\ngit, which I really enjoy using.\n\nThanks,\nDavid Mann\n"},{"id":"102553","messageId":"20090130084253.GA30046@denkbrett.schottelius.org","threadId":"17448","inReplyTo":"49824650.2070209@epstudiossoftware.com","subject":"Re: question re dcommit problem","fromName":"Nico -telmich- Schottelius","fromEmail":"nico-linux-git@schottelius.org","sentAt":"2009-01-30T08:42:53Z","receivedAt":"2009-01-30T08:42:53Z","isPatch":false,"sender":{"key":"nico-linux-git@schottelius.org","avatar":null},"body":"David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:\n> I created a git repository from my svn repository, later uploaded it to\n> GitHub, and after some branching and merging, can no longer dcommit back\n> to the svn repository. [...]\n\nIirc git svn does not support merges. You've to use git rebase or\nupdate through the svn server.\n\nSincerly,\n\nNico\n\n-- \nThink about Free and Open Source Software (FOSS).\nhttp://nico.schottelius.org/documentations/foss/the-term-foss/\n\nPGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C\n"},{"id":"102650","messageId":"200901302243.57996.trast@student.ethz.ch","threadId":"17448","inReplyTo":"20090130084253.GA30046@denkbrett.schottelius.org","subject":"Re: question re dcommit problem","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-01-30T21:43:54Z","receivedAt":"2009-01-30T21:43:54Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Nico -telmich- Schottelius wrote:\n> David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:\n> > I created a git repository from my svn repository, later uploaded it to\n> > GitHub, and after some branching and merging, can no longer dcommit back\n> > to the svn repository. [...]\n> \n> Iirc git svn does not support merges. You've to use git rebase or\n> update through the svn server.\n\nIt does support them on the git side.  To SVN, the merge should look\nlike the squashed result (along the first-parent line).  On your local\ngit end, it should rebase the merge (to allow for git-svn-id) but\npreserve parents, thus keeping history.\n\nHowever, it is very important that the SVN line of history is always\nreachable along the first-parent line.  David, did you ensure that?\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}