git-svn

Can I make git-svn more like git?

Is it possible (or desirable?!) to set up git svn to behave more like git? For example, instead of writing git svn dcommit why can't I just write git push Similarly, instead of git svn rebase why not just git pull ...

Git Svn dcommit error - restart the commit

Last week, I made a number of changes to my local branch before leaving town for the weekend. This morning I wanted to dcommit all of those changes to the company's Svn repository, but I get a merge conflict in one file: Merge conflict during commit: Your file or directory 'build.properties.sample' is probably out-of-date: The versio...

Is there a way to import svn history into git after the fact?

I already have a svn read only repo checked out (svn co and not git svn). I have made some changes and commits using git which is then pushed up to github. At this point, git does not have all of the history from svn. I was wondering if there was a way to extract and import this at this point. The various git-svn guides show how to im...

How do I import multiple branch-type directories into git-svn which aren't exclusive children of the same parent?

Sorry for the long title, but I wanted to make clear the distinction between this question and The one asked by CaptainPicard I have a svn structure like: trunk/ branches/* tags/* Release Candidate/* for all intents and purposes Release Candidates are used exactly like branches. So, I can tell git-svn to use Release Candidates as br...

svn to git conversion

I am trying to convert a sourceforge project from svn to git. According to some googling it should be possible to use this command: git svn clone http://PROJECT.svn.sourceforge.net/ PROJECT.git where PROJECT is the project name at sourceforge to get a svn project checked out into a local git repository. However this just gives the fo...

How do I track local-only changes/change sets with git-svn?

I want to have files that I track in my local git repository that do not get checked in to the central svn repository when I run git-svn dcommit. I often have long-lived local-only changes to files tracked in the repository. Sometimes it's for debugging code. I also have project IDE files that I'd like to track. With plain old svn, I...

Ignore modified (but not committed) files in git?

Can i tell git to ignore files that are modified (deleted) but should not be committed? The situation is that i have a subdir in the repo which contains stuff I'm not interested in at all, so I deleted it to prevent it showing up in auto-completions and the like (in the IDE). But now, if I add that folder to .gitignore, simply nothing ...

Pushing an existing git repository to SVN

I've been doing all my work in Git and pushing to GitHub. I've been very happy with both the software and the site and I have no wish to change my working practices at this point. My PhD adviser is asking all students to keep their work in SVN. I've found tons of documentation and tutorials about to pull down an existing SVN repo into g...

How can I copy my git revision history into svn?

I use Git, but some of my colleagues are unable to move away from SVN right now. We want the integration between the two systems to be seamless -- all of our development has been in git so far, so we need to copy that over into svn with complete revision history. I've been able to jigger this such that it copies the repository in a sin...

Mapping between git committers and SVN users

I'm using git-svn to store a "staging" version of some SVN repo, where other users are allowed to pull from this staging repo and commit there changes back to it, then the commits on the staging repo are periodically committed the upstream SVN repo. I want to know if there's a way to map between the git committers' names and SVN userna...

Why doesn't git-svn use the Subversion repositories UUID instead of its URL

Relocating a git-svn mirror of a Subversion repository isn't trivial: git-svn: what’s the equivalent to svn switch —relocate? So why doesn't git-svn use the repository's UUID instead of its URL in the git-svn-id? The UUID uniquely identifies the repository, so it seems a natural identifier to use and would handle relocatations much ea...

Can git-svn correctly populate svn:mergeinfo properties?

I am evaluating git-svn and trying to determine how well it will play with a particular svn repository. I am mostly concerned with getting git-svn to perform merges in such a way that the svn:mergeinfo property is correctly set in the subversion repo. Is this possible? Here is what I have done so far: # Checkout the SVN repo. $ git svn...

How to switch svn branches using git-svn?

Duplicate How do I make git-svn use a particular svn branch as the remote repository? I am using git-svn to track development by someone else on svn. I'm trying to figure out how to use gti-svn to switch from one svn branch to another. All the examples I have able to find talk about using svn switch as method to switch location ins...

Is there a way to "git svn dcommit" from a cloned git-svn repository :

Is there a way to "git svn dcommit" from a cloned git-svn repository : I have several branches in my svn, sometimes it is very small branch and it is nice to have it in the same directory, but sometimes these branches grow big and it is nice to move the whole thing to another folder. But when I do a git clone from this local repository...

git svn dcommit to sourceforge fails but it works via svn directly

I'm working on a Open Source project on SourceForge that uses Subversion. A few days ago I did a git svn clone and started tracking my changes using Git. After a while I tried to dcommit my changes back upstream. But that failed with the following error: Autorisierung schlug fehl: MKACTIVITY von »/svnroot/housebot/!svn/act/b8dbd0ff-f22...

How to git-svn clone the last n revisions from a Subversion repository?

Problem How do you create a shallow copy with git-svn from a Subversion repository, i.e. how do you pull only the last three revisions? The git clone command can get the last n revisions from a Git repository if you use the option --depth, i.e. you get a shallow copy of the repository. Example: git clone --depth 3 git://some/repo mysh...

RA layer request failed while git-svn fetch

I use git svn to sync with the subversion repos: $ mkdir prj && cd prj $ git svn init http://url/to/repos/branches/experimental $ git svn fetch and got the error message: RA layer request failed: OPTIONS of 'http://url/to/repos/branches/experimental': Could not read status line: connection was closed by proxy server (http://url/to/r...

Resolving Git Svn Conflicts

I'm using Git-Svn to interact with a Svn repository at work and I can't seem to find a way to effectively resolve conflicts for the life of me. I've read the other questions on this topic, but evidently I need something even more remedial because i always seem to end up in some kind of endless loop. I rebase, use mergetool (meld) to reso...

Convert an SVN checkout to use git (git-svn)

I work with software that is kept in svn for version control. I would like to use git (git-svn) however the software requires lots of setup and configuration before it can be used. There are tools that take care of all of the setup, including checking out all the code via svn. All the documentation for git-svn (I've been able to find) r...

Can't find git-svn on Mac OS X Leopard after installing via MacPorts

Okay people, I'm sure someone has had this issue and can help me out. I'm trying to get git-svn working on OSX Leopard (10.5.6). Using MacPorts I've run the install thus : sudo port install git-core +svn However, git-svn has not been installed and is not available. No errors came up during the lengthy dependency installation and so I'm...