I read git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: git://myserver/path/to/git/repos git-do-the-magic-svn-import-with-history svn://myserver/path/to/svn/repos git://myserver/pat...
It is obviosly some Perl extensions. Perl version is 5.8.8. I found Error.pm, but now I'm looking for Core.pm. While we're at it: how do you guys search for those modules. I tried Google, but that didn't help much. Thanks. ...
I've got a git-svn clone of an svn repo, and I want to encourage my colleagues to look at git as an option. The problem is that cloning the repo out of svn takes 3 days, but cloning from my git instance takes 10 minutes. I've got a script that will allow people to clone my git repo and re-point it at the original SVN, but it requires kn...
What is the best way to resolve a conflict when doing a "git svn rebase", and the git branch you are on becomes "(no-branch)"? ...
The situation I have a git repo and an svn repo that both hold the same source code but different commit histories. The git repo has a lot of small well commented submits... while the svn repo has a few huge commits with comments like "Lots of stuff". Both series of commits follow the same changes made in the code and are roughly equival...
Seems like a simple problem: I have an SVN repo inside our firewall. I have an SVN repo outside our firewall. I have users inside, and outside, the firewall. (no VPN isn't an option :( that'd be too easy) machines inside the firewall CAN talk to the outside SVN server. But not the other way. the outside SVN is a temporary thing - the ...
According to the manual, git dcommit “will create a revision in SVN for each commit in git.” But is there a way to avoid multiple Subversion revisions? That is, to have git merge all changes prior to performing the svn commit? ...
Our svn repository has lots of branches that are branches off of sub-trees. This works OK with svn because I can check out that sub-tree in the correct spot in my working copy. However, if I check out the same branch using git, I get a working copy with only the branch sub-tree. Is it possible to make git relocate the branch so that my w...
My motivation for trying out git-svn is the effortless merging and branching. Then I noticed that man git-svn(1) says: "Running git-merge or git-pull is NOT recommended on a branch you plan to dcommit from. Subversion does not represent merges in any reasonable or useful fashion; so users using Subversion cannot see any merges you've m...
A word of warning: I'm a n00b to git in general. My team uses feature branches in svn, and I'd like to use git-svn to track my work on a particular feature branch. I've been (roughly) following Andy Delcambre's post to set up my local git repo, but those instructions seem to have led git to pick the svn branch that had changed most recen...
I want to checkout, and then update as necessary, the Django Subversion trunk on a Mac OS X Leopard 10.5.5 machine. I am only interested in having updated Django code on my Mac. I am not interested in contributing patches to the Django project. I do not need the Subversion history for the Django trunk. I plan to use Git as the DVCS/SC...
I have an SVN repository structure like below. We are using multiple levels under branches for various release maintenance branches, plus a directory for feature branches. git-svn init seems to work with a single --branches argument, i.e. it seems to expect all of the branches to be in a single location. trunk branches 1.1 1.2.1 ...
I have a git repository which tracks an svn repository. I cloned it using --stdlayout. I created a new local branch via git checkout -b foobar Now I want this branch to end up in …/branches/foobar in the svn repository. How do I go about that? (snipped lots of investigative text. see question history if you care) ...
once you have a commit that contains a submodule object, you pretty much cannot get git-svn to commit past it. Any ideas, workarounds, anything that is not "don't use submodules with git-svn"? So far the answer seems to be a big NO. Is there any way to at least allow existing git commits containing submodule data to be committed to sv...
An svn repository I'm mirroring through git-svn has changed URL. In vanilla svn you'd just do svn switch --relocate old_url_base new_url_base. How can I do this using git-svn? Simply changing the svn url in the config file fails. ...
I'm a Git newbie. I recently moved a Rails project from Subversion to Git. I followed the tutorial here: http://www.simplisticcomplexity.com/2008/03/05/cleanly-migrate-your-subversion-repository-to-a-git-repository/ I am also using unfuddle.com to store my code. I make changes on my Mac laptop on the train to/from work and then push ...
I have a large Java app that is split up into multiple projects. Each project has its own folder in a Subversion repository like so: AccountingCore trunk branches tags Common trunk branches tags WebCommon trunk branches tags etc... I want to start using git-svn locally instead of subversion. This may be a stupid question...
I'm using git-svn to work against my company's central svn repository. We've recently created a new feature branch in the central repo. How do I tell git about it? When I run git branch -r I can only see the branches that existed when I ran fetch against the svn repo to initialize my git repo? ...
When running get svn fetch to pull the latest new branches from the upstream svn repository I got this error: $ git svn fetch fatal: failed to unpack tree object 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d read-tree 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d: command returned error: 128 Now every attempt at git svn on that local repo resul...
I have a local git repository which tracks a remote SVN repository via git svn. I have made and committed some changes in the local git repository, but now I'd like to create a branch that reflects SVN HEAD in order to make some changes to the code as it stands in SVN, because I don't want to propagate the changes in my git master to SV...