Hello all, I've read http://utsl.gen.nz/talks/git-svn/intro.html, "An introduction to git-svn for Subversion/SVK users and deserters" and, I guess I'm looking for a little more information. It is possible that I am trying to use git and git-svn in a manner for which they were not designed, so I appreciate any guidance that can be provided. Also, since I'm running FC6, I have git version 1.5.0.6 installed, instead of the 1.5.2.2 that I see on the home page. Perhaps that could be my problem. Anyway, we have a subversion server set up to track our internal software development. I would like to use git/git-svn so that I can work offline, commit early and often, and occasionally synchronize to our subversion baseline. Finally, at least one of our subversion repositories (my own personal one), is not set up in the traditional svn://host/repo/{trunk,tags,branches} format. It is organized as svn://host/wpd/{project1,project2,project3}. Since it's my own personal playground, I don't need branches, and tend to remember tags just be commit number. That's the long, boring setup. Now for the long boring question... I started playing with a new project over the weekend, checkign in a handful of commits in git, and now I want to import/export/push/pull them to the subversion server. Having read through the tutorial, I started with: $ svn mkdir svn:///host/wpd/empty-project -m "Created empty project directory" $ git-svn init svn:///host/wpd/empty-project $ svn-git fetch Now I have an empty directory into which I was hoping to "pull" my changes from my weekend playground $ git pull ~/playground/new-project ... (I get 7 new files, and, it looks like, their associated history) Here's where I get stuck... 1) How can I remind myself of what I changed relative to what was in the Subversion repository the last time I sync'd to it? Under my current model of operation, I come in after a weekend/night away, do "svn status" and "svn diff" to remind myself what's changed, and commit those changes with appropriate log messages. I am hoping that I can make the changes locally, commiting them with nice log messages as I make the changes, and then "push" them to the subversion server when convenient. 2) This is going to have some obvious problems when I work on other projects shared with other developers. We know how to address this with Subversion (good communication, updating the working copy prior to a commit, resolving the minor conflicts, etc...) what can I expect when my local repository is git? 3) If I try to commit my change with: $ git-svn dcommit I get an error Commit 0e3e.... has no parent commit, and therefore nothing to diff against. You should be working from a repository originally created by git-svn and that's where I get confused. Is this a bug/feature of 1.5.0.2 that will disappear if I switched to 1.5.2.2? Are there any other tips/resources for mixed mode operation (centralized Subversion server, distributed git client(s))? Thanks for any pointers. --wpd - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
