git-svn

How to handle IDE project files with git-svn

南笙酒味 提交于 2019-12-10 22:19:30
问题 I'm using git-svn and there are IDE project files in the svn repository. Everytime I start my IDE it modifies project files a bit and they are marked as changed in the status display. And then if I try to do a git svn rebase to update my working tree to have the latest changes from the svn it fails as I have local modifications on the project files and I have to stash the changes. How can I ease my workflow so I wouldn't have to stash/stash apply everytime I haven't really modified anything?

Installing/building git-svn for RHEL 6

对着背影说爱祢 提交于 2019-12-10 21:27:13
问题 I do not have access to the RHEL6 repo, so what wouold be the best approach to building and/or installing the git-svn tool on RedHat Enterprise Linux 6? Managed to install git & git-svn 1.7.9 by uninstall the existing one (yum erase git) and make installing the latest one from source. Worked on 64-bit too. 回答1: A possible solution would be to rebuild locally (ie in a directory within your home directory) everything: git and its dependencies svn and its dependencies perl and ruby (used by git

git svn clone prints hundreds of “error: too many matches for svn-remote.svn.added-placeholder”

走远了吗. 提交于 2019-12-10 16:46:14
问题 I ran the following command to clone an SVN repository: git svn clone -s --preserve-empty-dirs --username=my_svn_username https://svn.repo/path projectname This ran successfully for a few hours, but is now printing the following message many, many times per revision: error: too many matches for svn-remote.svn.added-placeholder The clone process appears to continue; I can see revisions appear in the logs between these messages. However, the number of times this error is printed seems to be

How do I access svn branches using git-svn with a non-standard svn repo layout?

拈花ヽ惹草 提交于 2019-12-10 16:38:40
问题 The standard repo layout in svn is as follows. /trunk /branches featureX featureY /tags 1.0 2.0 The repository I'm working with is a much flatter structure. trunk featureX featureY Essentially, trunk is at the same level as the other branches. I can't use the -s or -b option with git svn init because of this. How would I pull in trunk as the git branch master and pull in featureX as a git branch of the same name? I don't care about any other branches or tags. I've seen similar questions and

How do I fetch/clone only a few branches using git-svn?

喜欢而已 提交于 2019-12-10 13:59:46
问题 The SVN repository that I am working with has a rather large number of branches. I am only interested in working with three of them and maybe another new SVN branch that will be created in the future. What I have figured out so far is that the command git svn clone URL -T trunk -b branches -t tags will clone all SVN branches and subsequent git svn fetch commands will also operate on all SVN branches. Is there a way for me to specify the few branches that I want to work with? I most likely don

git-svn rebase error

ⅰ亾dé卋堺 提交于 2019-12-10 13:34:11
问题 I am getting the following error after running git svn rebase: 'update-index --refresh: command returned error: 1' Any ideas? Below is the entire output. $ git svn rebase --dry-run xxx-iphone/xxx_prototype2/xxx_prototype2.xcodeproj/project.pbxproj: needs update xxx-iphone/xxx_prototype2/xxx_prototype2.xcodeproj/project.xcworkspace/xcuserdata/xxx.xcuserdatad/UserInterfaceState.xcuserstate: needs update xxx-iphone/xxx/xxx_prototype2/CouponBookViewController.h: needs update xxx-iphone/xxx

How to “Commit” changes to GitHub with GitHub Desktop

流过昼夜 提交于 2019-12-10 12:48:44
问题 I have recently downloaded GitHub Desktop and clone a repository. I am trying to upload new project files in it by GitHub Desktop. How do I go about doing this? 回答1: Okay, I too had the same problem and i figured it out. Make whatever the changes that you want to make in your local repository. open github desktop app. click on the repository at the left hand pane. On the top you will see a drop down menu (by default set to master in my case), change it if you so desire or leave it the way it

git svn clone died of signal 11 under cygwin

早过忘川 提交于 2019-12-10 12:37:11
问题 I have a problem with git svn under cygwin user@comp /cygdrive/c/repositories/git/repo $git svn clone --username=username "https://host/svn/repos/repo" . Initialized empty Git repository in /cygdrive/c/repositories/git/repo/.git/ error: git-svn died of signal 11 How to handle this? user@comp ~ $svn --version svn, version 1.6.15 (r1038135) compiled Nov 29 2010, 14:09:28 user@comp ~ $git --version git version 1.7.4 回答1: I found a good tip here: http://pwizardry.com/devlog/index.cgi/2010/03/29

GIT How to clean history pack for old deleted files?

匆匆过客 提交于 2019-12-10 11:58:13
问题 I imported a very old SVN project, with git svn clone. The problem was that I picked up the root folder of that repo, where I already had imported all other sub-projects (into new git repos), and each one was deleted from SVN. So, when importing the root folder (with the final 8 subfolders) into one single git repo, all history for the full repo was also imported (included the deleted sub-projects history). I did several commands to clean the pack file, with no success. It has always 571Mb.

Using git within an svn checkout? (without git-svn)

萝らか妹 提交于 2019-12-10 07:37:23
问题 I did a number of searches, but couldn't find an answer to this question. Apologies if it is a duplicate. I'd like to know if there are any problems initializing a git repo (for local usage) within an existing svn checkout, but without using git-svn . Here's my scenario: My team uses svn and is not familiar with git . I'm still learning git ; I'm not nearly as familiar with it as I am with svn . I'd like to make use of the powerful local features of git (like branching, stashing, etc). I do