Grab revisions from SVN and merge with git repository?
I have an SVN branch with several commits that I want to export and merge into a git repository based on the same code (but without the changes). How do I do that?
I have tried creating a new git repo using git svn and then merging to git repos together, but that marked every single line in conflicting files as a conflict. Can I force it to run a proper diff instead of just marking everything as a conflict?
Update. I ended up creating a branch and copy-pasting files from svn there, then did a merge with another branch. Nasty, but it worked.
I would like to merge in a branch 2 a quite long list of revisions from branch 1. This list is contained in a text file, like, say : 1 3 78 … //a long list of revisions here... 324 Is there an elegan
Here is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run svn: E195016: Reintegrate can only be used if revisions 11430 through 1238
I have a remote SVN repository (X) where a freelance developer is committing his work. However, in my company we work with GIT and are using git-svn to interoperate GIT and SVN. That's ok! So, I've cl
I am trying to use git-bundle with a git-svn repo. Essentially, I need to create an offline git repo that has a clone of our production SVN system. The SVN repository is cloned through git-svn, which
I migrated my SVN repository successfully with Tags into Git using git svn-clone. However, git svn-clone does not migrate svn:externals. Hence, I decided to modify branch tree using git filter-branch.
I have beem using git for quite some time now, mainly git-svn. Now I want to convince my colleagues to switch from svn to git. But unfortunaly the precondition is that the svn repository keeps on livi
My project is currently using a svn repository which gains several hundred new revisions per day. The repository resides on a Win2k3-server and is served through Apache/mod_dav_svn. I now fear that o
SVN repository in: svn://server/myPath/svn/repos Git repository in: git://server/myPath/git/repos I'm trying to clone the svn project so I used this command: git svn clone svn://zone.spip.org/spip-zon
Preamble My SVN hosting is provided by a 3rd party which limits my usage to 300MB. As the project is only of a moderate size, I never imagined this would be a problem. Once the app went to production,
I currently have a git repository that I imported from svn a while ago name school. Inside this school repository I have a folder for each of my classes. I can't seem how to take this one repository a
As title, is there any way to reconstruct a svn repo from a full clone with git-svn (containing every single commit starting from r1)? Edit: I probably should add that I am looking for a practical mea
I have a git svn repository. git svn clone http://myrepo/ myrepo I dont want to work in master: git checkout -b development hack for a while. git checkout master git svn rebase git rebase developmen
I'm in a big team which uses SVN as the revision control. I'm in a subgroup of the big team which try to use git for some integration test of the codes from this subgroup. Following is what we want t
In this way I can clone a SVN repository: svn co svn+ssh://<username>@<url>/var/lib/svn/<repository_name> /var/www/<repository_name> It starts to create the expected files und
We have moved most of our codebase from a monolithic svn repository into a set of git repositories. For various reasons, some work (on old versions of the project deployed in the field) has to continu
I keep hearing that branching in git is so much easier than in SVN, because it's easier to merge the branch back to trunk/master. I've read some tutorials, but they only covered basic merge conflicts
I'm going to manage a Korean localized version of PuTTY in mercurial. The requirements for the mercurial repository: We should be able to keep track of the latest revisions from the PuTTY svn reposit
When I clone our svn repo using git svn i pass it arguments to tell it where the head, branches, tags... etc are and it pulls the main code base properly. in addition to trunk and branches we also hav
Is it possible to get all revisions of a project copied onto my local machine? Basically, what I'd like is to be able to pull projects W, X, Y, and Z out of a remote SVN repository and have access to
I need to fetch revisions from SVN into GIT. I have two types of branches under SVN: Standard branches located in /branches folder under SVN Some specific branches located under /branches/devs/ folde
I recently used git-svn to clone an SVN repository, for the purposes of maintaining my own branch of an open-source project. I'm also working with others on this branch, so we use a shared Git reposit
I have access to an SVN repository that I can grab occasional snapshots of revisions (as .gz, not through svn update) and am hacking the code to add some customizations that I do not have any intentio
For various reasons, I need to separate the repository from the working copy onto separate drives, though allow push/pulls to still function normally. Is this possible in Git? Is this possible in SVN?
I'm trying to migrate my svn repository to git repository using Atlassian tutorial (https://www.atlassian.com/git/tutorials/migrating-overview) and I'm failing to checkout my svn repository correctly.
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 sometim
I have created a new repository and added some things inside, now i have a huge list of revisions because of the addition. I wish to collapse all of the revisions into a single one, but I couldn't fin
experts on stackoverflow.. I'm new on git, develop C# project with small team. assuming the project need contribution from freelancer, i lock important part of my code by create the DLL, and create a
svn-all-fast-export looks to be a great way to move from svn to git and it supports splitting one svn repository into multiple git repositories. I want to do the opposite. I have a set of closely-rela
I checked out trunk and branch (let's call it B1) from my repository. I want to merge some revisions in trunk into B1, so I am doing this (pwd is B1): svn merge 6057:6068 ../trunk ./ then SVN tells me
I am trying to clone big svn repository to my git repository. The problem is that rep. is too big and svn clone works too slow. Is there way to clone only last N revisions? Something like that: git s
I have checked out an svn repository of an open source project. Now I have made some custom changes and I would like to store these changes in a git repository. As far as I have understood, this can b
This question already has an answer here: Remove sensitive files and their commits from Git history 4 answers Redaction in git 5 answers Suppose I found out that there are files that weren'
There is a git repository which is updated from svn (git svn fetch) in fixed periods of time (1 hour for example). After fetch is finished every branch from refs/heads is updated with its correspondin
I have a huge svn repository with about 2.5gb files. It has many branches and tags. It has 72000 revisions. I want to make a local git clone Doing this through regular git clone takes about 24 days. W
I have a problem with git svn For this one, it occurs when try to git svn dcommit Unable to determine upstream SVN information from HEAD history. Perhaps the repository is empty. at C:\Program Files
I'm looking for some good tools/scripts that allow me to generate a few statistics from a git repository. I've seen this feature on some code hosting sites, and they contained information like... com
I'd like to merge a remote git repository in my working git repository as a subdirectory of it. I'd like the resulting repository to contain the merged history of the two repositories and also that ea
Git-svn allowed for a duplicate filename, just with different case, to be added to our subversion repository. On Windows this meant that subversion could not checkout the file, complaining of a duplic
I recently migrated a project to GitHub from Subversion but the current working local directory is still an SVN local repository. Due to complicated reasons it wouldn't be good to make a new git clone
I'm trying to run git for my local repository and use SVN for my central repository to a CodePlex project. I downloaded the most recent version of msysgit, but the SVN support doesn't appear to be wor
I have an SVN repository, which has many directories inside. Now I would like to clone this repository, leaving only one particular directory in it. And of course I don't need any revisions related to
I just discovered that even though the rebase section in git help svn says This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it.
How can I delete a file which is already in the SVN repository without deleting it from my file system? Tortoise or Command Line instructions welcome. The following works, but I am hoping for someth
My company uses Subversion; I prefer Git. I have cloned the Subversion repository on my work machine using git-svn and am relatively comfortable using Git as a Subversion client. Now I would like to t
I have successfully installed Subversion and set up repository for my project. Then added project to repository, checked it out and opened it in KDevelop. I can see Subversion menu items but every ti
I just finished converting a Subversion repository to git using git svn clone--stdlayout --authors-file=ourcommitters.txt svn://svn.internalserver.com While doing so, I had the git flag 'core.autocrl
I need to move a SVN repository from one server to another in Windows. The trick is that I want to exclude everything except the trunk, branches, and tags from a project within a nested repository. I
I am thinking about converting my svn repository on my server to git, but I am not sure what would be the benefit for me, since I already use SmartGit/hg which creates a local git repository and commi
I have a primary git repository for an opensource project I want to mirror all commits to a svn repository (on code.google.com), is it possible ?
I am using git version 188.8.131.52 and I have the following situation: Clone git repo from svn | * * (<= commits to master & corresponding commit to svn) * * | master (points to svn HEAD) | |___ m