Hi, So, I'm using this script: http://mojodna.net/2009/02/24/my-work-git-workflow.html which creates svn-like diffs from git for use in ReviewBoard. The thing is, running git diff produces no output, but git svn-diff produces a huge output (files that HAVE changed, but not recently). I've created a local branch from the remote branch a...
Hi, I am trying to migrate my svn repo from svn to git and it keeps on failing, it stops with the following output: W: -empty_dir: trunk/ncontinuity2.core/extensions When I do a git branch -a, it shows that it has not moved all the branches and indeed displays some branches that have been previously delted. I have decide I can live w...
Is there any way to use git-svn to clone only some folders of an SVN repo structure. I'm trying to clone a repo that has some crazy big binary files and a number of subfolders that are just plain useless. I've tried using the --ignore-paths option, but my clone seemed to just stall out doing nothing for an extremely long time. Have an...
Hi, I am trying to migrate from git to svn with the following command: git svn clone --stdlayout https://my_sourcecontrol or with git2svn svn2git --notags https://sourcecontrol -v During the migration, it just stops with the following statement: W: -empty_dir: directory When I do a git branch -a I see it has imported the tags ...
How can I clone a git repo from my laptop (at home) to a server (at university) while getting most of the repo from a third (svn) repo at another uni that is the main codebase. I'd like to minimise the amount of home<->uni traffic by maximising uniOne<->uniTwo traffic. this is what I have now on Laptop: --o--o--o---o---o---o git-s...
I'm trying to git-svn to work on a private shadowcat svn server. git svn clone -s http://dev.catalystframework.org/repos/Catalyst/Catalyst-Plugin-ConfigLoader/ Initialized empty Git repository in /home/ecarroll/code/perl/foo/Catalyst-Plugin-ConfigLoader/.git/ Using higher level of URL: http://dev.catalystframework.org/repos/Catalyst/Cat...
I am pretty sure I have tried everything, figured I would ask all the gurus on here. Background: I had an SVN repository on an old linux box. I accessed this SVN repo with git-svn. The system's hard drive crashed and the SVN repo was lost. Question: Since I have an entire backup of the SVN repository on my local machine through me usin...
I have an svn repository where the original structure looked something like: features/ trunk/ branch1/ But then over time moves to the standard svn structure of: trunk/ branches/ tags/ etc. Is there any way for svn2git or git svn to work with this? Alternatively, is there any way to re write svn history in a non-destructive ...
I am using git version 1.7.2.3 and I have the following situation: Clone git repo from svn | * * (<= commits to master & corresponding commit to svn) * * | master (points to svn HEAD) | |___ my-branch (no equivalent svn branch) | * * (multiple commits to this branch) * * ...
I'm trying to fix an intermittent bug in git-svn. The problem is happening in Windows XP only, with both Cygwin git (perl v5.10.1) and msysGit (perl v5.8.8). With any operation that involves a fetch, I'm able to get partway through and then the operation dies with a message similar to Couldn't open .git/svn/refs/remotes/trunk/.rev_...
I've been using Git as a fat client for a Subversion repo, which has been great. I'm supposed to follow the one-commit-per-Trac-ticket methodology, but I much prefer having a rich history of atomic commits for my own benefit, so I've gotten into the following habit: Make topic branch for Trac ticket Hack away, making several commits Us...
I'm working with an svn repo that has about 10 branches that are each about 4 gigs in size, and it seems that when I run fetch using git-svn it wants to fetch ALL of these branches. I really only personally work with two of them, so how can I just fetch those two branches and ignore the rest? ...
Hello everyone, I'm 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 living quite a time. So I searched for an solution an came up with the book: Jon Loeliger's "Version Control with Git" I bought it and...
I'm trying to set up three things: a public GIT mirror of a public SVN repo a pubilc fork of that repo where multiple contributors can stage patches a private fork of the public repo from #2 I know how to do #1 but am looking for advice on #2 and #3: how to configure, how to keep in sync, things to avoid, etc. Here's more details: ...
A git svn clone with --stdlayout get me multiple branches if the source SVN repo has multiple branches (and tags). I want to push all of them to another git repo. The git svn clone did seem to have retrieved all the history for all the versions. Is this a matter of giving better instructions to git push? Here's my possibly misguided w...
There's an SVN open-source project which I have read-only access to, and I'd like to create a GIT mirror of that project up to date on GitHub. I know how to set up the initial mirror and then keep it up to date with git svn rebase, but that still requires having a server set up somewhere with a cron job running to handle the syncing, s...
Many open-source projects (e.g. django) have GIT mirrors which are, in turn, forked for private or public development. GIT mirrors are kept up to date with git svn rebase. But the Pro Git Book contains this unequivocal recommendation: Ahh, but the bliss of rebasing isn’t without its drawbacks, which can be summed up in a single ...
I have a github-based git repository that represents development up to a certain point, and then a svn repository, not initialized with git svn, that has further development. I want to bring the svn changes into the git repository, start using the git repo for development, and push changes using git svn dcommit. Is this possible? Is i...
Is svn-rebasing-and-pushing from multiple clients to the same Git repo vulnerable to race conditions if both clients try to svn-rebase and push concurrently? Here's more info: I'm setting up a GitHub-hosted mirror of an SVN project. To do the mirroring, I'll run this cron job every few minutes (per this article): git svn rebase git.e...
I want to take a function out of one file and put it into another, but keep the blame history. cp a.php b.php vim b.php # delete everything but 1 function vim a.php # delete the 1 function git add a.php b.php git commit But if I run git blame b.php I only see it blaming to this new commit. ...