version-control

问题 I exported a bunch of changesets from my local working repo after doing a pull from the server repository. To make sure the patches work, I cloned a fresh repo from the server and I tried to apply the changeset. Unfortunately, the import fails with this: applying G:\OSS\premake-dev\premake-dev_rev493.patch unable to find 'src/host/scripts.c' for patching 3 out of 3 hunks FAILED -- saving rejects to file src/host/scripts.c.rej patching file src/base/api.lua patching file src/host/scripts.c

问题 I am adding a project to perforce via VS2010 but I keep getting this error 'file' not under client's root for all the files in the project. I can't seem to figure this out. Here is what I am doing: 1) Open VS2010 project which is not in perforce yet. 2) I select add the solotion to perforce (from File > Source Control > Add Solution menu). 3) I select a new workspace. It brings up the properties of the workspace. The root folder is default to c:\Users\My.Name. I change this to the folder

问题 I fear I already know the answer but here goes anyway.. I accidentally clicked "Discard All Changes" in VS Code (OSX) and now a month's worth of work is gone. Poof'd. Thing is, I didn't have GIT properly setup so I hadn't done any commits yet. Is there anyway I can get my work back? Right now my working directory is as good as empty.. [edit] I should clarify, the console log says it did a "git clean -f -q" which would mean the files are gone. But I was wondering if VSCode maybe has a backup

问题 I have changed a file (configuration file) for my project. I would like this change to be only local and therefore disappear from the list of changes ready to be committed. Is there any easy way to do that? Please note that the configuration file is regularly stored in the repository. 回答1: One way is: git update-index --assume-unchanged -- /path/to/file Another: git update-index --skip-worktree -- /path/to/file (the second will resist to a git reset ) But I prefer using a content filter

问题 (in topicBranch) git add . git commit -m "added new feature" git checkout master git merger topicBranch gives me the following error: error: Your local changes to the following files would be overwritten by merge: Looking at the log, the file in question is just some breakpoint related file buried deeply within my xcuserdata directory. My thinking was to run git rm --cached path/to/that/file and the problematic file would be removed from the index and git would have no problems with a merge.

问题 i am about to clone code from svn repo (on centos) using git svn clone -s svn://xxx, then it is interrupted for strange problems, the error message is as follows: Following parent with do_switch Successfully followed parent Use of uninitialized value in concatenation (.) or string at /usr/lib/perl5/vendor_perl/5.8.8/i386-linux-thread-multi/SVN/Core.pm line 584. Network connection closed unexpectedly: at /usr/libexec/git-core/git-svn line 2693 then i continue this clone process using time git

问题 When trying to import my SVN repo in Git, using the following command: git svn clone -s https://xx.xx.xx.xxx/repo/iphone/project ./project It runs for a long while and then finally craps out with the following error: RA layer request failed: REPORT of '/repo/!svn/vcc/default': SSL negotiation failed: SSL error: parse tlsext (https://xx.xx.xx.xxx) at /usr/local/git/libexec/git-core/git-svn line 5091 Has anyone ever seen this problem? 回答1: I was never able to figure this out. I ended up doing

问题 I’m working on a project using Accurev as a VCS. Since I’m not at all familiar with it, I’m wondering if it would be a good idea to use git “internally” - meaning I would use git locally, then doing the “official” commits with Accurev. Would this be an OK approach? If yes, I would naturally want to exclude git from the Accurev versioning. Is it sufficient to have a .acignore that looks something like this: myproject/.git myproject/.git/* myproject/.gitignore Thanks! 回答1: You should be able to

问题 Let's say I am on a different branch than <local-branch> , called <different-branch> . When I try to pull from a remote branch to a local branch, I do the following: git pull origin <remote-branch>:<local-branch> And, from my understanding this should pull into my <local-branch> , and not pull into <different-branch> . But, then when I check git log while I'm on <different-branch> , I see that those commits are from <remote-branch> ? How do I pull from a remote branch, into a local branch,

问题 I work at a small LAMP Development Studio where the idea has been to just get the code done and go on to the next item on the list. The team works in Zend Studio 5.5 connected to the Live server via FTP or SFTP. What they love about this is the speed of their deployment of code (since its just modifying live code). But of course this is not good due to many obvious reasons. I would like to move them to a Versioning System (CVS, SVN or any other tool) but the catch is, I am not their senior so