git-svn

Is there any way to compare two files in Git without their formatting changes?

点点圈 提交于 2019-12-11 13:44:10
问题 I have committed some code with some format but the origin has some other format. The reviewer is asking me to revert all my changes and I am searching for some UI tool or some way in Git to remove formatting and give the actual result. 回答1: I think you might have a look at git diff, in particular the two following options: -b, --ignore-space-change Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace

Renaming trunk folder after SVN to Git Migration

懵懂的女人 提交于 2019-12-11 13:34:37
问题 I have 30 some projects which I migrated to Git, from SVN. However, when I browse the folder structure, I still see the trunk folder there in each project. Is there a way to remove this quickly and automatically? Here is my svn folder structure, note that the repository itself does not have trunk, but the projects do: --MyRepository --Project1 --trunk -- files --Project2 --trunk -- files --Project3 --trunk -- files --Project4 --trunk -- files --Project5 --trunk -- files -- .. And this is what

svn to git conversion no refs in common

断了今生、忘了曾经 提交于 2019-12-11 13:16:39
问题 I am trying to convert an svn repository to git following the instructions at http://www.albin.net/git/convert-subversion-to-git. I've done this once before following the same instructions, and it worked, but this time at step 4 in the instructions "git push bare" I get the following error. No refs in common and none specified; doing nothing. Perhaps you should specify a branch such as 'master'. fatal: The remote end hung up unexpectedly error: failed to push some refs to '/Users/[ME]/new

fatal: unable to run 'git-svn'

时光总嘲笑我的痴心妄想 提交于 2019-12-11 08:53:17
问题 I've never seen this one before. I'm creating a development on a new Mac by cloning several svn repositories to local git repositories. Several pulled just fine, but one is being stubborn. They're all being pulled from the same svn server and there are no differences that I know of. I've tried to clone this one particular repository 4 times now and it's always the same result: r3378 = 0b759d82e55df2e54fdbcb74859e56cc4f40eb5c (svn/trunk) Auto packing your repository for optimum performance.

How to make git-svn use specific version of SVN?

此生再无相见时 提交于 2019-12-11 08:47:14
问题 On my Linux machine I use both SVN and Git. To make my life easier I added source /opt/svn/linux64/ix86/svn_1.8.5/interface/startup/svn_1.8.5_64.env to my .bashrc and thus writing svn –version shows 1.8.5 as expected. But when having this git-svn fails upon checkout. This happens in Git 1.7.10.1 and is an already known incompatibility (see for example here). I can easily work around it by source ing SVN version 1.7.9. But that requires me to restart SSH connection. And then after performing

“Unable to determine upstream SVN information from working tree history” when using two (Git and SVN) repositories

拜拜、爱过 提交于 2019-12-11 07:55:51
问题 I have a following problem - I'm working on a Git repository that's based on a SVN repository. I used git svn clone path-to-repo command to clone the SVN repository so my Git one retains the same history and has a common base. After cloning, I added a Git remote repository using git remote add origin path-to-my-git-repo . Then, I applied some more commits and pushed it to Git repository only (so, obviously they don't have git-svn-id like the commits cloned from SVN). SVN repository won't be

Using git-svn with an unconventional repo layout that includes a directory that should be accessible to any branches

那年仲夏 提交于 2019-12-11 07:29:49
问题 Where I work, we use a slightly unconventional svn repo layout for projects. It looks like this: project/ branches/ tags/ trunk/ utils/ We're a pretty small company, and most of our projects are relatively small. Each developer working on a project usually has a checkout of the whole repo, and there are some post-commit hooks that prevent changes being made to multiple branches at once. The utils folder contains some scripts that are useful for each project, including things like automating

When converting from svn to git using git-svn or svn2git, how can I change the base path of the repository and possibly still keep branches/tags?

℡╲_俬逩灬. 提交于 2019-12-11 07:18:20
问题 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 root directory of the repository contains one directory, base (not the real name) and then all the stuff. This is kind of a problem for us, as it adds a few

Unable to determine upstream SVN information from HEAD history in some of git-svn commands

狂风中的少年 提交于 2019-12-11 07:09:33
问题 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 (x86)\Git/libexec/git-core\git-svn line 780. I also have a problem with git svn info which show the same error message. I try many ways as another topic provided but it never work. :( I already try git fsck , git svn rebase -l also. My repository is about 20,000 revisions. I fetched from http:/

Removing a specific file with its history from the Git history

僤鯓⒐⒋嵵緔 提交于 2019-12-11 06:15:31
问题 I want to delete the revision history for a specific file in my Git repository that was made long ago. The goal is to make it look like the file was never committed for a specific revision. Does anyone know how to do this? Thanks! 回答1: Sounds like you want git filter-branch. However, please be sure to consider the warning on the man page: WARNING! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to