version-control

问题 I have a poject that has thousands of files. I made some changes that affected almost half of the files. the changes included editing existing files and adding new files and directories. I need to revert all these changes and restore the project to how it was. I have created a tag before doing all this but I am not sure how I can restore the whole project from the tag 回答1: This is unfortunately the kind of thing that CVS is particularly not good at. I do not believe that you can lose the

问题 Moderator Note: Given that this question has already had sixty-seven answers posted to it (some of them deleted), consider whether or not you are contributing anything new before posting another one. What are the differences between git pull and git fetch ? 回答1: In the simplest terms, git pull does a git fetch followed by a git merge . You can do a git fetch at any time to update your remote-tracking branches under refs/remotes/<remote>/ . This operation never changes any of your own local

问题 On Windows 7, I have been using Tortoise for Subversion. I am also using Eclipse plugin for Subversion. I am using both of them interchangeably for making commits or updates to the project files. But on another system, I have same setup, Tortoise doesn't recognize the folders/files as SVN which are checked out using Eclipse. I wonder, how can I fix this? 回答1: My experiences with Eclipse Subversion plugins (Subclipse, Subversive) and other clients (command line client, Tortoise, RapidSVN)

问题 I want to migrate my project from SVN to git but I would like to have a clean history of all files and basically get rid of branches. A few of the issues I have: Some modules (subdirectories) where created, worked on and later discarded. I don't want them in my history. Some code was developed at different places in the repository (not a branch of this project) and then svn copy'ed. i.e. /otherproject/trunk/foo was incorporated into /myproject/trunk/bar. It should look like it was developed

问题 Can some body please help me to understand what is the difference between following two git commands? $ git branch -d testing and $ git branch -D testing When should we use -D? 回答1: git branch -d is for deleting branches that are fully merged in its upstream branch or to HEAD if you don't have a upstream for your branch. If the branch is not fully merged it will not perform the deletion. git branch -D deletes the branch even if it's not merged. 回答2: In complement to the other answer: think of

问题 So for some reason (miscommunication for what the actual subversion URL is and only 1 person working on the code previously) we have two different subversion repositories with what we want to be the same code. Basically the timeline went like this: Created X repository Put code in Created Y repository Put code from X in Made modifications to Y SVN repo Y got corrupted (so he just stopped committing.. not bothering to say something before the backups replaced themselves) I made changes to X

问题 I have a three branch setup in TFS, DEV, PRE, and PROD. My team wants to merge individual files from DEV to PRE, so the code can enter test as they complete it. However, I've heard this is not a good idea, and that if we need to do that, we need to be using a feature branch setup. Does anyone have any recommendations on if we should or shouldn't be doing the merging at that fine level (and then when ready to move to production, we'd migrate the entire branch). 回答1: You would typically want to

问题 I have a three branch setup in TFS, DEV, PRE, and PROD. My team wants to merge individual files from DEV to PRE, so the code can enter test as they complete it. However, I've heard this is not a good idea, and that if we need to do that, we need to be using a feature branch setup. Does anyone have any recommendations on if we should or shouldn't be doing the merging at that fine level (and then when ready to move to production, we'd migrate the entire branch). 回答1: You would typically want to

问题 I had a Netbeans project with all the directory structure and so forth. I imported my Netbeans project to an online repository. The above was all done with a windows pc. Now, with Ubuntu and RapidSVN (a GUI svn client) I checked out my repository to the NetBeansProjects Directory. When I load NetBeans I get a class not found exception saying: A java.lang.NoClassDefFoundError exception has occurred. However, the system should continue working without further problems. Click Show Details for

问题 Let's say someone checkedout some files and then he/she undo the checkout. Can I find those undo checkout tracks in TFS history? Where? 回答1: Current checkouts are tracked (obviously), but there is no history of changes to this list (it is just the current checkout/lock list). History only includes checkins and the changes made in them. Why do you want this information? There maybe a better approach to solving your underlying problem. 回答2: No. As the un-done changes are never checked in they