Questions tagged [git-svn]

git-svn is a bidirectional bridge between git and Subversion allowing to use a remote Subversion repository as a local Git repository while still be able to send changes back to Subversion.

This function allows a developer to work in git locally while still using a SVN repository as the master revision control system. They can use all features of git locally, and then check their files into a Subversion server when they are ready to commit. Running git locally allows the developer to use the staging area, do branching and merging, rebasing, cherry-picking, etc.

Basic Commands:

This makes a local git copy of the SVN repository:

git svn clone url://path/to/repo -s

Work with the files using the local Git repo. When ready to commit changes to git:

git commit -am 'What I worked on'

To commit back to the master SVN server:

git svn dcommit

If working with other developers and a merge is necessary, git-svn rebase pulls any changes from SVN to your local git repository.

1931 questions
0
votes
3 answers

Is there a `git-dropbox` or equivalent?

I know there are many tutorials to use Dropbox as a Git repository, but I do want to know is how to recommend non-technical staffs to commit their changes. So it would be nice if I can git-fetch all change history from Dropbox, merge/resolve…
ernix
  • 3,442
  • 1
  • 17
  • 23
0
votes
1 answer

Git command "git svn rebase" not working with XCode 4.3.1

I have cloned few SVN Project on my system, I used to do "git svn rebase" to sync them up with SVN Repositories. Now after updating XCode to version 4.3.1, this command stopped working. Executing "git svn rebase" on my mac (v 10.7.3) gives me error…
0
votes
1 answer

Re-Syncing Diverged SVN and Git Repositories

I have two repositories one on googlecode and one on github. I at one point, not too many commits ago had these repositories merged (via these instructions: http://help.github.com/import-from-subversion/). I was trying to re-merge these commits…
Dave
  • 2,849
  • 4
  • 28
  • 20
0
votes
2 answers

How can I import SVN with inconsistent branching structure into Git?

I apologize if this question has been asked before, but my case is a relatively specific one. I have been at my company for some time and using SVN, but desired recently to move to Git, for various reasons. The issue I'm having right now is that my…
Matt D
  • 1,476
  • 3
  • 17
  • 26
0
votes
1 answer

Why would a git branch shared with two committers have many commits twice? (possible interaction with git-svn)

When I setup my branch I did: git svn rebase git checkout -b branch-a Then I pushed that branch to the remote git repository and a colleague and I did work on it using git commit, git pull and git push. Now, I wanted to pull in all the new changes…
Sarge
  • 2,367
  • 2
  • 23
  • 36
0
votes
2 answers

Remote Subversion Repository

My current project has it's master Subversion repository located on a network with restricted access. Most of our developers have access to this network and have full functionality with the code base. I currently have 1 "remote" developer that does…
schmimd04
  • 1,444
  • 3
  • 14
  • 23
0
votes
1 answer

How to use diff command on git repo

How can I use the 'diff -u' command to generate patches that can be applied to a 'git/sv', repository? I am intending to run the diff command on a 'git-svn' repo.
user626607
0
votes
2 answers

Can't see repo after "git svn clone " on Mac Leopard

We use SVN here at the office and I'm experimenting with using git-svn for myself. I created a directory in /usr/local/code/git and did my checkout to /testco. I used the commands given in the man page, git svn clone , where is my repo. It goes…
Geuis
  • 41,122
  • 56
  • 157
  • 219
0
votes
2 answers

Using git as a deployment mechanism for a codebase managed in svn?

I'm currently looking at phpfog as a platform for a bunch of apps maintained by a small team. I love git, and really like the fact that they let you push to the phpfog platform over git. The apps I'm looking at hosting are all currently being…
growse
  • 3,554
  • 9
  • 43
  • 66
0
votes
2 answers

Syncing two fragmens of two companies GIT repositories?

I have a GIT question: Assuming there are two companies, each running its own GIT repository containing their projects. Now there is one project that they both work on and would therefore like to have that particular project in both…
Christofer Dutz
  • 2,305
  • 1
  • 23
  • 34
0
votes
1 answer

How to properly preserve all branches using svn-git (standard layout) then svn-clone with --bare option

I'm attempting to move an svn repository to a git repository. I don't want to use svn anymore so I am using the no-metadata option. I'm curious why, after doing git svn fetch there are only remote refs created to my branches. I'm creating the…
Chrissy
  • 155
  • 2
  • 8
0
votes
2 answers

Git-SVN merge lost my link to trunk

EDIT: I see that this question has been asked before! git-svn: reset tracking for master Someone with the right permissions can probably close this as a duplicate. I'm using git-svn. I recently finished working on a branch in git that was tracking a…
Luther Baker
  • 7,236
  • 13
  • 46
  • 64
0
votes
1 answer

How to push to a remote SVN repository ... that I am tracking

I have a local branch that I created via git branch --track I've checked out the branch locally and when I pull, I can see that Git automatically knows where to pull from $ git pull From . * remote-tracking…
Luther Baker
  • 7,236
  • 13
  • 46
  • 64
0
votes
1 answer

Branching with Git and SVN

I cloned an SVN repository down and I've been working on master - checking things in locally - but I haven't yet pushed to SVN. Now, I've decided I want to push my local changes "on master" to a new SVN branch (not to the main trunk). What is the…
Luther Baker
  • 7,236
  • 13
  • 46
  • 64
0
votes
2 answers

Fail to convert svn to git. It justs stops

I am following this guide On step 2 the clone/checkout just stops with no error. If I rerun the command it stops again. Any idea what is the problem? I have trunk, tags, branches, everything standard for SVN. EDIT: Is it possible to migrate only the…
mynkow
  • 4,408
  • 4
  • 38
  • 65