version-control

问题 We're a small team and we need to deploy a small, simple and easy to maintain VCS. In past we've been using ftp based sharing where we shared zip of source, we need to improve it. I've been looking for a VCS but not sure how it'll blend into our remote server based environment, most of them are best with intranet. Environment : We've a Rackspace remove server and team is connected through internet. We work on ASP.Net. Here're a few options I've come across - Git / Github tortoisesvn.net http:

问题 I am very new to version control, so my questions are very basic. I am trying to use Mercurial for the purpose. I have a local working directory on my mac. I want to use Bitbucket to backup the files and the repository in this directory. Will the following command: hg push localDirectoryWithRepo http://bitbucker.org/user_name/repo_on_bitbucket transfer my files also to Bitbucket, or only the repository? Also, I tried the command: hg clone localDirectoryWithRepo http://bitbucker.org/user_name

问题 I'm a git noob, and I know I'm missing something fundamental here. I've got three branches: master, feature1 and feature2. No two branch is identical, yet any attempt to merge from one branch to the other results in an "up-to-date" message. As you can imagine, I've done my work on feature1 and feature2, and now I just want to merge that work back into my master. Here is what my current graph looks like: * c719e79 master |\ | * 3f38259 feature2 | * 4e2af8c | * a6ee18c | * 2339052 | * 2e31d49 |

问题 I have a huge repository with many subfolders in the following layout: MainRepo ├── Folder1 ├── Folder2 ├── Folder3 ├── Folder4 └── Folder5 I'm trying to create another repo from folders Folder1, Folder2 and Folder3 . To do that I created the filemap to use in convert like this: include Folder1 include Folder2 include Folder3 rename . But when I try to convert the repository using: hg convert --filemap filemap MainRepo/ NewRepo I get the following error: ... <rev> message 1136 Merge with

问题 I have a small chunk of code that constantly fails when I try to get the workspace. var tfs = new TfsTeamProjectCollection(new Uri("https://mytfs.com/projects")); var versionControlServer = tfs.GetService<VersionControlServer>(); var workspace = versionControlServer.GetWorkspace(@"C:\MyProjects\ProjectA\BranchA"); I've verified that it's mapped in TFS (by, ya know, having worked on several branches of ProjectA over a couple years). I also specifically checked the mapping after I received the

问题 I just set up a Beanstalk account and created a repository using git. My repository is being used to hold different websites I am working on, and it will act as the staging server. Repository - website1 - website2 - website3 Inside of those folders are the websites active files. So when I commit any changes, I set it up to automatically deploy to the staging server FTP. So I have: developmentdomain.com/website1/ developmentdomain.com/website2/ developmentdomain.com/website3/ And then once it

问题 I have a Git repository with a remote branch structure like this: bugfix001 bugfix002 feature feature001 feature002 feature003 master task task001 task002 where 'feature' and 'task' are folders within the branch structure and the 'feature001', 'feature002' branches are under the parent 'feature' branch folder. My question is - is it possible to rename the 'feature' parent folder and keep all the branches under it. So I could rename it to 'hamster' and the structure would look like this

问题 I use git checkout -b somebranch origin/somebranch to make sure my local branches track remotes already. I would like a way to pull from the tracked branch no matter which branch I am using. In other words, I want to say git pull or some other command, without specifying the branch, and have it mean git pull origin somebranch if I'm on the local branch somebranch Is there a way to do this without putting an entry in the config file for each branch? It would be difficult to maintain if we have

问题 After installing some package with pip from vcs like this pip install git+https://github.com/kennethreitz/requests.git@355b97165c#requests how can I display the vcs revision/commit/branch/tag (355b97165c in this example) used to install it? 回答1: There's currently no way to do this because url used during installation is not being recorded anywhere. However there's work in progress to add such functionality. See Continuing Feature/record download info pull request. I'd like to thank dstufft

问题 I had some shelved changes in Android studio However, for some reason the shelved changes are not there anymore. I have checked /project_directory/.idea/shelf/ but they are not there either. does Android studio backup .patch files somewhere else other than .idea/shelf? 回答1: As far as I know, you're probably screwed. IntelliJ/Android Studio do not use git stash to do their "shelving", it's an entirely separate mechanism. You might be able to recover the old version using the "Local History"