I'm moving a project from SVN to git (completely, so no need for git svn's SVN interop features) and I've tried using both git svn and svn2git (nirvdrum's fork on github) and one problem I've got is that our repository layout in SVN was like so: example.com/website/trunk|branches|tags/base/code, and so when I import it into git, the r...
I'm using so many git-svn repositories (at the same time) that it's becoming a chore to update them all. I'd like to write a script that automates this, so I can just run it every morning while I fetch a coffee. Basically my workflow is like this cd ~/module1 git svn fetch git checkout master git svn rebase git checkout topicbranch gi...
I have an svk repo that was full of mirrors and locals etc, I cleaned it up in steps, because I'm trying to get rid of it, and evaluating what should stay. There's only one project there that I want to keep working on, and for that I want to migrate it to git so I can be done with svk for good. It's located in //local/foo, it has no svn...
I'm tired of subversion, it keeps corrupting its own repository. As I was for a long time curios of git and always wanted to try it out, I've decided to give it a go and use git-svn. But reading through documentation I realized that you can't use much of git awesomeness with it. You can't use git-pull, it is not recommended to create loc...
Hi, I have 'git' install, but I am not sure if I have the 'svn' bridge install as well ("the part to run 'git svn'). So I tried to do sudo port install git-core +svn on Mac. But I end up getting: ---> Activating git-core @1.6.3.3_0+doc+svn Error: Target org.macports.activate returned: Image error: Another version of this port (git-...
Hi, I am creating my working directory using this git command: git clone git://git.webkit.org/WebKit.git WebKit Is it possible to remove a directory and its subdirectories locally and yet it won't screw up my future 'git svn rebase' when I try to sync up to a newer version of webkit? Thank you. ...
I'm working with an SVN repository that is laid out like this: $SVN/[project]/trunk $SVN/[project]/branches/[user]/[branch] $SVN/[project]/tags/releases/[tag] My .git/config looks like this: [svn-remote "svn"] url = $SVN fetch = project/trunk:refs/remotes/trunk branches = project/branches/*/*:refs/remotes/* When I...
I'm trying to import a large subversion repository into git using git-svn (so that I can work in git but still dcommit to subversion from time to time). After importing more than 4000 revisions I'm now getting the following error whenever I run git svn fetch or git svn rebase, which I don't manage to get rid of: $ git svn fetch error: i...
I am wondering, what kind of code is/should normally be committed to a project repo (branches, not master)? Complete features only? Is it considered wrong/frowned upon to commit half completed code? ...
I commit a few changes locally and then push to github using 'git push origin master'. It always pushes the complete code base (judging by the amount of data transferred). I must be missing something simple.. should only push up the changed files..? ...
We use branches to do our work and keep trunk pristine for the most part. Before merging my changes from my branch into trunk, I want to make sure that I've got the latest changes from svn/trunk into my local branch. It's taken me a bit to figure it out but here's the workflow I've come up with, and I'd like to know if there's a better w...
Currently, when I run git svn dcommit git creates a separate commit in SVN for every local commit I've made since last syncing with SVN. Is there any way for dcommit to instead combine all my recent local commits into one commit for SVN? ...
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 internal subversion into git on my machine. How do I now push the changes into the remote subve...
I have a bare git-svn repository and did a 'git svn fetch' on it. Running 'git log' doesn't show the updates. I'm sure there are updates as it displayed the files changed after 'git svn fetch' and 'git svn log' shows them also. Please note that I purposely made this a bare repo so 'git rebase' will not work. What is the appropriate co...
So I am trying to switch to git, by using git-svn. I am having a svn repo called myrepo from which I want to clone just the project called myproject. The thing is that by running the following command: git svn clone path-to-repo/myrepo/myproject --stdlayout --prefix=svn myproject the whole repo myrepo is cloned rather than just myproj...
Hi Guys, I am trying to setup git on windows box - and so far all appears to be working ... except this :) net start shhd - gets the error NETHELPSMG 3534 When I type cygrunsrv --start sshd I get - QueryServiceStatus: Win32 error 1062 Any ideas how to fix this ? ...
Hi everyone, I'm trying to migrate a small SVN repository w/ 2000+ revs with 10+ branches to GIT. Branches sometimes merge contents from other branches. My main choice, was obvisously to use: git svn clone -s URL However, my GIT history only preserved the branching information and never shows a merge. Having an hard time googling for...
I'm trying to use git to clone an svn repository with std layout (using the -s option). The repository uses https anonymously (the repository is at https://secure.simplistix.com/svn/xlwt/). I can check the repository out fine using svn, but with git-svn I get password prompts and then cannot check out (I don't have an account for this re...
I'm modifying an open-source project that's stored in an SVN repo. Since my changes will likely take a while to complete, I've checked the project out as a Git repo using the git-svn bridge. I don't have access to the project's Subversion repo so I can't push changes back to it, but I'd like to publish my Git repo (on GitHub) so others c...
This is the scenario: I copied my subversion trunk into a tag "A". I then ran 'git svn fetch' from my local repository which found the branch point and added it as the remote branch 'svn/tags/A'. Later I removed tag "A" from subversion, and again ran 'git svn fetch'. I did a 'git branch -rd svn/tags/A' to remove the dangling remote bra...