question re dcommit problem
I created a git repository from my svn repository, later uploaded it to GitHub, and after some branching and merging, can no longer dcommit back to the svn repository. I notice that somewhere along the way the
git-svn-id: messages no longer appear on my master branch. When I try to git svn dcommit I get weird messages like this:
mannd@SuperSluggo:~/dev/git/epsimulator> git svn dcommit Committing to
https://epsimulator.svn.sourceforge.net/svnroot/epsimulator/epsimulator/trunk
...
Filesystem has no item: File not found: transaction '435-24', path '/epsimulator/trunk/epsimulator.kdevses' at /home/mannd/libexec/git-core/git-svn line 480
Any way to fix this? If not, I will just abandon SVN and stick with git, which I really enjoy using.
Thanks,
David Mann
David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:
Quoted 3 lines
I created a git repository from my svn repository, later uploaded it to GitHub, and after some branching and merging, can no longer dcommit back to the svn repository. [...]
Iirc git svn does not support merges. You've to use git rebase or update through the svn server.
Sincerly,
Nico
Signature · 4 lines
Think about Free and Open Source Software (FOSS). http://nico.schottelius.org/documentations/foss/the-term-foss/ PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C
Quoted 7 lines · Nico -telmich- Schottelius
David Mann [Thu, Jan 29, 2009 at 07:14:08PM -0500]:
Quoted 3 lines
I created a git repository from my svn repository, later uploaded it to GitHub, and after some branching and merging, can no longer dcommit back to the svn repository. [...]
Iirc git svn does not support merges. You've to use git rebase or update through the svn server.
It does support them on the git side. To SVN, the merge should look like the squashed result (along the first-parent line). On your local git end, it should rebase the merge (to allow for git-svn-id) but preserve parents, thus keeping history.
However, it is very important that the SVN line of history is always reachable along the first-parent line. David, did you ensure that?
Signature · 2 lines
Thomas Rast
trast@{inf,student}.ethz.ch