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 would just put those files into a changelist labelled "XYZ: DO NOT CHECK IN," and then just manually deal with the problem when I actually DO have changes that I

问题 I use git-svn on windows for the first time , git svn rebase show error: fatal: index file open failed: Invalid argument Why it happened and how can i fix it ? Thanks. 回答1: If you are using msysgit on windows, there is a regression on msysgit1.8.4 for git-svn. It seems to appear when executed in a CMD, not in a bash shell, so you can try that same command in a shell. Or you can SubGit , which is much more complete and robust tool for transitionning from svn to git repo. Listen to his author

问题 [Update] For more details, The reason that why I try to do pure Git at home is that, my company would like to move to Git but manager won't like to make change because developer don't have knowledge with Git on our own repository. So, what I try to do is, I try to make everyone use Pure git while someone can merge back to Subversion during this learning phase. So, in any emergency case, they can still using Subversion. So, before everyone familar with Git, I cannot transfer repository to use

问题 I m trying out git-svn and I am getting the following error. What I've done so far is git svn init -T <my svn repo> then I've been committing to my repository with git commit -a then once I did a few of those I did a git svn fetch and then I tried a git svn dcommit However, that fails with Unable to determine the upstream SVN information from HEAD history. Perhaps the repository is empty I can also see that the files in my file system are not marked as being used by svn (not sure if this

问题 Subversion was popular several years ago, now git is becoming popular and more and more people want to replace Subversion with git. Problem is that a lot projects were based on Subversion. So question is how to use git together with Subversion. Do not replace svn completely, and use git. The simplest way I can figure out is to create git based on the Subversion branch code you have already checked out. Then use git to control locally. After modifications, submit to local git server, then

问题 When running get svn fetch to pull the latest new branches from the upstream svn repository I got this error: $ git svn fetch fatal: failed to unpack tree object 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d read-tree 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d: command returned error: 128 Now every attempt at git svn on that local repo results in the same error. Originally I was running git version 1.5.6.4_0 and after the error I tried updating to 1.6.0.2_2 and the problem still persists. Is there

问题 I'm trying to import our SVN repository into Git. When I run either this command: git svn --authors-file=/path/to/authors --trunk=trunk clone https://my-repo/project . or this command: svn2git https://my-repo/project --no-minimize-url -v --authors /path/to/authors Both return this error: Author: patrick not defined in /path/to/authors file ..but as far as I can tell, there is nothing wrong with my authors file: $ grep patrick /path/to/authors patrick = Patrick <none@example.com> That error

问题 I use git (with git-svn) on linux and a colleague uses svn on windows. So many times, git reports whitespace issues. In fact it fails to commit a linear history because of these problems and creates merge conflicts. What is the simplest way to configure svn/git and git-svn on windows and linux so that there are now whitespace issues? Following is a reported merge conflict, in a linear history on master: error: patch failed: frontend/templates/frontend/base.html:38 error: frontend/templates

问题 How do I get git-svn to forget the svn authentication details ? We have a pairing machine running windows server 2008 on which we have a git repo and we check-in to a central subversion repository. I want git to prompt me for my subversion authentication details each time I check-in. I have removed the subversion files from under %APPDATA%\subversion\auth\svn.simple. Now whenever I use a regular subversion client I get prompted for my subversion auth but git-svn remembers the credentials

问题 I am trying to import my repository from svn to git using svn2git, but it seems like it's failing when it hits a branch. What's the problem? Found possible branch point: https://s.aaa.com/repo/trunk/project => https://s.aaa.com/repo/branches/project-beta1.0, 128 Use of uninitialized value in substitution (s///) at /opt/local/libexec/git-core/git-svn line 1728. Use of uninitialized value in concatenation (.) or string at /opt/local/libexec/git-core/git-svn line 1728. refs/remotes/trunk: 'https