dvcs

问题 I just read Spolsky\'s last piece about Distributed vs. Non-Distributed version control systems http://www.joelonsoftware.com/items/2010/03/17.html. What\'s the difference between the two? Our company uses TFS. What camp does this fall in? 回答1: Simply speaking, a centralized VCS (including TFS) system has a central storage and each users gets and commits to this one location. In distributed VCS, each user has the full repository and can make changes that are then synchronized to other

问题 I understand well how Git can support file moves : as it uses file hash, a \"added\" file is easily detected as beeing same as the \"removed\" one. My question is about refactoring : considering Java, the package declaration changes so the file content will NOT be the same. In such case, how does Git determine that the \"added\" file shares history with the \"removed\" one ? Does it check for \"most similar content\" assuming I only made minor changes, or similar non-deterministic solution ?

问题 We\'re currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py I believe the time has come to move on to better source control, and I\'ve been toying with Mercurial for a while. There seems to be two schools of though on managing such a release structure using Mercurial. Either each release gets its own repo, and fixes are made against the release branch and

问题 We use tortoise hg with Kiln. In my vs 2010 c# project there are some files that are part of the repository but I would like tortoise hg to ignore them when I make a commit. For eg., say in a login screen I may hard code the userid, password for testing. I dont really want this file considered during a commit. I understand .hgignore file but this really works for files that are not part of the repo. Any trick in tortoise hg to ignore files that are part of the repo ? (so they do not show up

问题 I\'m using Mercurial locally for a project (it\'s the only repo there\'s no pushing/pulling to/from anywhere else). To date it\'s got a linear history. However, the current thing I\'m working on I\'ve now realized is a terrible approach and I want to go back to the version before I started it and implement it a different way. I\'m a bit confused with the branch / revert / update -C commands in Mercurial. Basically I want to revert to version 38 (currently on 45) and have my next commits have

问题 After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit. However, I only want to undo the working copy changes of just that one file alone, nothing else with it. How do I do that? 回答1: You can use git checkout -- file You can do it without the -- (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get

问题 Possible Duplicate: Using Git how do I find modified files between local and remote How can I see incoming commits in git? Or even better, see what I just git fetch / git pull ed? Edit: To clarify the question: someone tells me that, to get some fixes, I should pull from their repository. My goal is to see what their changes are before I accept them. git pull automatically merges, which is not what I want. git fetch will grab them without merging, but I\'m unsure how to view what exactly I

问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 6 years ago . Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the \"base\" revision) and support

问题 I use GIT on a Mac. Enough said. I have the tools, I have the experience. And I want to continue to use it. No wars here... The problem is always with interoperability. Most people use SVN, which is great for me. Git SVN works out of the box, and is a no frills solution. People can continue happily use SVN and I don\'t lose my workflow and neither my tools. Now... Some guys come along with Mercurial. Fine for them: they have their reasons. But I can\'t find any GIT HG out-of-the-box. I don\'t

问题 This question already has answers here : pull/push from multiple remote locations (14 answers) Closed 5 years ago . How can I make git push to push not only to origin but also another remote repository? as git push is only an alias for git push origin , can I alias git push to push to 2 remote repositories at once (with just that one command)? I’m not looking for a non-git script here but would like to set this up for my local repository in git. When I tried it with post-push scripts I failed