Comments on: git-svn with svn:externals http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/ off on a tangent Mon, 01 Dec 2008 20:51:48 +0000 http://wordpress.org/?v=2.5.1 By: Nazar Aziz http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-43068 Nazar Aziz Thu, 15 May 2008 17:22:18 +0000 http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-43068 Hi there. I've just posted a new article with more information on how to use Git's sub-projects instead of sub-modules with git-svn. The article is here: http://panthersoftware.com/articles/view/4/git-svn-dcommit-workaround-for-git-submodules Thanks. Hi there.

I’ve just posted a new article with more information on how to use Git’s sub-projects instead of sub-modules with git-svn.

The article is here: http://panthersoftware.com/articles/view/4/git-svn-dcommit-workaround-for-git-submodules

Thanks.

]]> By: Tom http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42619 Tom Thu, 01 May 2008 23:06:08 +0000 http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42619 Yep... I'm using symlinks now too... not liking the subproject thing in git. Yep… I’m using symlinks now too… not liking the subproject thing in git.

]]> By: Graham http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42406 Graham Thu, 24 Apr 2008 23:19:39 +0000 http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42406 Cheers Tom. I wish I'd seen your message sooner as I'd have tried it. As it is, I've found a simple alternative to submodules; symlinks! The git-cat-file error disappears immediately. I'm not sure if I'm losing any features by dropping submodules, but I suspect not as I can cd into the plugin and branch it independently of my rails project, then check it back in to subversion independently. I wrote a script that wraps up everything that I do to make a new git repo and uploaded it to github. There's a blog post about it here: http://effectif.com/2008/4/24/easy-git-svn-for-rails Cheers, Graham Cheers Tom. I wish I’d seen your message sooner as I’d have tried it. As it is, I’ve found a simple alternative to submodules; symlinks! The git-cat-file error disappears immediately.

I’m not sure if I’m losing any features by dropping submodules, but I suspect not as I can cd into the plugin and branch it independently of my rails project, then check it back in to subversion independently.

I wrote a script that wraps up everything that I do to make a new git repo and uploaded it to github. There’s a blog post about it here: http://effectif.com/2008/4/24/easy-git-svn-for-rails

Cheers,

Graham

]]> By: Tom http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42400 Tom Thu, 24 Apr 2008 21:29:18 +0000 http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42400 Graham, I was just having the same problem so I started over and had another problem where I would get this message: $ git svn rebase Cannot rebase with uncommited changes: # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # new file: .gitmodules # new file: vendor/plugins/myplugin # So I ran "git reset HEAD .gitmodules" and "get reset HEAD vendor/plugins/myplugin" and now all *seems* to be well. Perhaps running the command will fix your issue as well. Graham, I was just having the same problem so I started over and had another problem where I would get this message:

$ git svn rebase
Cannot rebase with uncommited changes:
# On branch master
# Changes to be committed:
# (use “git reset HEAD …” to unstage)
#
# new file: .gitmodules
# new file: vendor/plugins/myplugin
#

So I ran “git reset HEAD .gitmodules” and “get reset HEAD vendor/plugins/myplugin” and now all *seems* to be well.

Perhaps running the command will fix your issue as well.

]]> By: Graham http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42392 Graham Thu, 24 Apr 2008 15:45:30 +0000 http://blog.alieniloquent.com/2008/03/08/git-svn-with-svnexternals/#comment-42392 This is a cracking post, and I've almost got it working. I can't check back into subversion with git svn dcommit though, as git-svn is trying to commit my submodule (even though it is listed in .git/info/exclude). git-cat-file falls over: rug% git svn dcommit Committing to https://svn.myhost.com/path/to/repo/trunk ... A .gitmodules A vendor/plugins/myplugin fatal: git-cat-file e1b159e9bb6dc35108ca4ed9fe166ca2d39bc488: bad file 32768 at /usr/bin/git-svn line 416 Any thoughts? I've scripted all this up (blog post to follow once I've got this problem fixed). I'm just trying to figure out how to get git-svn to ignore the submodule... Cheers. This is a cracking post, and I’ve almost got it working. I can’t check back into subversion with git svn dcommit though, as git-svn is trying to commit my submodule (even though it is listed in .git/info/exclude). git-cat-file falls over:

rug% git svn dcommit
Committing to https://svn.myhost.com/path/to/repo/trunk …
A .gitmodules
A vendor/plugins/myplugin
fatal: git-cat-file e1b159e9bb6dc35108ca4ed9fe166ca2d39bc488: bad file
32768 at /usr/bin/git-svn line 416

Any thoughts? I’ve scripted all this up (blog post to follow once I’ve got this problem fixed). I’m just trying to figure out how to get git-svn to ignore the submodule…

Cheers.

]]>