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
1
vote
2 answers

I'm using git-svn and I accidentally typed 'git svn rebase' on my feature branch, what are the ramifications?

I'm using git-svn and I accidentally typed git svn rebase on my feature branch, what are the ramifications? Normally I type git svn rebase on master, then I'll type git rebase master feature to update the feature branch. Is it safe to checkout…
Daniel Kaplan
  • 62,768
  • 50
  • 234
  • 356
1
vote
1 answer

Git svn clone pulls bad repository

When converting a JavaScript/Web project from Subversion to Git, I'm seeing a problem, even when I start over from scratch (the first Git repository is always bad). The git svn clone works fine. From here on, pulling a bare repository looks good,…
orbfish
  • 7,381
  • 14
  • 58
  • 75
1
vote
2 answers

Multiple sites based on common foundation

I'm working on a project that will be a base site for multiple other sites. Most of the core functionality will be the same so I don't want to maintain the same code all over the place and I'm wondering how best to do this. Currently I have the…
kjs3
  • 5,758
  • 8
  • 34
  • 49
1
vote
1 answer

Convert svn projects to git, but allow merging of bugfixes made in svn

I have a svn repository with many projects—but I am only interested in some (parts of server and full-client). trunk server src src-that-should-be-in-client other-src-that-belongs-to-server cfg …
Tobias Schulte
  • 3,765
  • 1
  • 29
  • 33
1
vote
1 answer

GIT to SVN migration perseverving user checkin data for multi-user

Question: I was wondering how you would preserve the user check info when migrating a GIT repo to a SVN. Example: Say that I have two repository. One as a SVN and the other as a GIT rep. Say that you have multiple checkin for different users (…
darewreck
  • 2,576
  • 5
  • 42
  • 67
1
vote
2 answers

Is there a way to treat a committed file like a staged file when I checkout branches?

I'm writing a performance test for code that I've already committed to see what speed improvements I've made. To do this, I created a branch of the code before my performance fix. I have my test class staged which is convenient because I can…
Daniel Kaplan
  • 62,768
  • 50
  • 234
  • 356
1
vote
0 answers

Git-svn get all revision history

When I first started my project, I did a git svn clone -rN of the latest revision in my repo. However, I would like see all the code's history via git blame/annotate. How do I check out all the revisions that I've missed from the repo? I am fully…
Infinity
  • 3,695
  • 2
  • 27
  • 35
1
vote
2 answers

What are the downsides to using the official Windows Git binaries from cygwin?

Cygwin's latest git, svn and git-svn combination is stuck at old versions that have numerous git-svn bugs. I'm considering just downloading the official windows version (warning: this will start the a download: http://git-scm.com/download/win ),…
Daniel Kaplan
  • 62,768
  • 50
  • 234
  • 356
1
vote
3 answers

git add is adding files to staging area

I am trying to commit some modified files to my git staging area with command git add. However the files are not adding to the staging area. The below is the output of git status:- :~/Desktop/production-18-12-2013$ git status # On branch…
SemperFi
  • 2,358
  • 6
  • 31
  • 51
1
vote
0 answers

git svn returns "out of date" on push and sync in SmartGit and "unable to determine upstream svn information from working tree history" on dcommit

I try to push my changes from my local git repro to my company's SVN-repro. After pull and merge all changes from svn i try to dcommit my changes. git svn dcommit but i get this error: unable to determine upstream svn information from working tree…
Floyd
  • 1,898
  • 12
  • 20
1
vote
1 answer

Which remote branches are my local git-svn branches bound to?

I have the following .config file in my clone repo using git-svn: [core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true hideDotFiles =…
void.pointer
  • 24,859
  • 31
  • 132
  • 243
1
vote
1 answer

How to list committed git files per size?

Is it possible to list the set of committed files in a git repository, per file size? I am using TortoiseGit under windows 7.
Jérôme Verstrynge
  • 57,710
  • 92
  • 283
  • 453
1
vote
2 answers

svn2git or git svn import

I'm about to migrate my SVN repo to GIT. I'm going to use svn2git which uses the git-svn. Is there any way the process modifies the SVN repo? Since obviously this is very sensitive to change, I want to be sure that the original SVN will not be…
Himberjack
  • 5,682
  • 18
  • 71
  • 115
1
vote
1 answer

Git-svn for repo with independent subprojects

I'm trying to use git-svn for an svn project that has multiple sub-projects, each with its own independent trunk/branches/tags structure: PROJECT SubprojectA branches tags trunk SubprojectB branches …
Peter O
  • 599
  • 1
  • 4
  • 18
1
vote
2 answers

git-svn broken on Mac OS X Mavericks

I am having some serious issue with git-svn. Until I did not update to Mac OS X Maverick, it all worked fine (source tree and git svn command line) but now there are following errors while I try to checkout a svn repository: On command line : …
Anand
  • 864
  • 10
  • 31