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
0 answers

How did git(-svn) set correct links to svn:externals?

This is not a question about something not working, it is a question to understand why something is working. Here is my setup: projects | |--- mylibs | |--- main I have two different, unrelated git-svn checkouts mylibs and main. They…
Alex
  • 41,580
  • 88
  • 260
  • 469
1
vote
1 answer

Cygwin: git svn complains about bad config file

On Cygwin using git-svn performing remote operations such as: git svn rebase git svn dcommit etc. Causes one of many strange error messages to occur regarding bad config files $ git svn rebase fatal: bad config file line 1 in…
Tom Jacques
  • 665
  • 1
  • 5
  • 19
1
vote
0 answers

git-svn new branch refetches the whole history

I wanted to create a git clone of a big svn repo with git-svn. My primary problem however is that whenever a new branch is created, the whole history is re-downloaded: "Found possible branch point" and it starts downloading from r1 ('til…
1
vote
1 answer

Asp.net project's property "Web \ Use Local IIs Web Server" effecting other team members

I just change the Properties of my asp.net project like given below. Property\Web\Use Local IIS Web Server \ Project Url: http://domain.com Property\Web\Use Local IIS Web Server \ Override application root URL: http://domain.com But after the…
1
vote
1 answer

How to determine LOCAL tracked branch?

Ok the situation is as follows: I have a git branch in my local repository called 'feature-branch'. This branch is git-svn enabled, it is tracking the local branch 'remotes/svn/branches/feature-branch' . And this branch is tracking a SVN branch in…
1
vote
1 answer

git-svn commits to wrong branch / how to merge svn branch via git-svn

I have a SVN repository which I checked out with git-svn, using the --stdlayout option (at that time, the repo was empty). I then worked on the master branch for a while. When using git svn dcommit, it would svn-commit my changes to…
crater2150
  • 899
  • 9
  • 25
1
vote
3 answers

How can I use git as an intermediate code review stage before pushing out the remote subversion?

I would like to be able to review code checked into the internal subversion repository before pushing those changes to the remote subversion server. How can I use git to stage the development subversion for review? I have already fetched the…
Shoan
  • 4,003
  • 1
  • 26
  • 29
1
vote
1 answer

Don't see a new branch after creation

I have created a new branch and went with a browser to check if it was created but I don't see it. $ git svn branch -n -m "Students line" student_line --destination branches Copying https:///svn at r294 to…
Eugene
  • 59,186
  • 91
  • 226
  • 333
1
vote
3 answers

Not erasing the previous commits and changes to it.

Hey I am new to github so please help me out. I have four commits. commit4 eh87eg87 commit3 e3e983jj commit2 de6d6e3d commit1 du3qw6y1 I want to go back to commit2 and make changes to it and commit it (commit 5) and not lose the rest of the…
JS_VIPER
  • 141
  • 1
  • 2
  • 7
1
vote
1 answer

history not preserve while move svn to GIT (for svn Move folders)

I have an SVN project with a structure as specified below: PROJECT > trunk, branches, tags, subproject1, subproject2, release notes I have restructured the project through the SVN MOVE command so it looks like: trunk, branches, Tags. (moved the…
TechS
  • 167
  • 1
  • 5
  • 14
1
vote
0 answers

mistakenly deleted svn remote configuration, what to do?

I had git repository set to track a certain svn repository. I periodically updated my master branch to the svn repo: git svn fetch git rebase git-svn the master branch had no modifications. Then, I messed up stuff, so I decided to wipe away my…
Lorenzo Pistone
  • 5,028
  • 3
  • 34
  • 65
1
vote
0 answers

Enabling SVN tracking in a git clone of a git-svn clone that didn't start at revision 1?

Suppose I have a git svn clone that I created like this: $ mkdir foo $ cd foo $ git svn clone -s -r 100:HEAD http://svn.example.com/project and then I git clone it like this: $ cd .. $ git clone foo bar $ cd bar So now bar has foo as its origin.…
Ben
  • 9,184
  • 1
  • 43
  • 56
1
vote
1 answer

Git delete cached

I have 2 git repos, I have for example folder1. When i do git rm --cached folder1 and then push the changes and then pull them from the other repo, it deletes them from the other repo. I have added it previously however I no longer with to track the…
1
vote
2 answers

How do I continue pulling from subversion from a git clone which was not originally pointing to svn

Given I have created a git repo on machine1 by pointing to svn with git svn clone --trunk=http://foo/project And I keep pulling in new revisions from svn on machine1 with 'git svn rebase' When I clone the git repo from machine1 to machine2 How do I…
marekj
  • 1,235
  • 2
  • 10
  • 11
1
vote
1 answer

"git svn clone" from almost-standard svn layout

We have a subversion repository that we're migrating to git. The layout of the svn repository is almost standard, but at some point in the history some idiot developer (okay, it was me) accidentally created a directory, call it "/foo", in the…
Martin
  • 3,703
  • 2
  • 21
  • 43