version-control

问题 I'm looking for a tool to migrate a couple of SVN repositories to Mercurial, with history, labels and so on. I'm using TortoiseHg (Windows x32), so ConvertExtensions are discarded. There's some info on how to do this process on a Linux box (hgsvn), but I don't have a Linux machine available. Can I use those Python scripts on Windows? If so, what do I need to do it? Or, what other tools can I use to do this process? Basically, how can I convert an SVN project to Mercurial? 回答1: I just had to

问题 I am currently working on a project that is a spinoff (fork) from a framework I have been working on. This project is intended to be pretty generic, but now I need to fork the codebase again for a client of mine. At this moment, I have created a custom branch for my client, but I'd rather have a standalone repository for this. Is is possible to 'fork a fork'? If not, what alternatives do I have? Outline of the situation: Framework repository (original) Generic application repository (fork)

问题 After being told by at least 10 people on SO that version control was a good thing even if it's just me I now have a followup question. What is the difference between all the different types of version control and is there a guide that anybody knows of for version control that's very simple and easy to understand? 回答1: Eric Sink has a good overview of source control. There are also some existing questions here on SO. 回答2: We seem to be in the golden age of version control, with a ton of

问题 Anybody have a script or alias to find untracked (really: unadded) files in a Perforce tree? EDIT: I updated the accepted answer on this one since it looks like P4V added support for this in the January 2009 release. 回答1: EDIT: Please use p4 status now. There is no need for jumping through hoops anymore. See @ColonelPanic's answer. In the Jan 2009 version of P4V, you can right-click on any folder in your workspace tree and click "reconcile offline work..." This will do a little processing

问题 I'd like to rollback a change I made recently in TFS. In Subversion, this was pretty straightforward. However, it seems to be an incredible headache in TFS: Option 1: Get Prior Version Manually get prior version of each file Check out for edit Fail - the checkout (in VS2008) forces me to get the latest version Option 2: Get TFS Power Tools Download Team Foundation Power Tools Issue rollback command from cmd line Fail - it won't work if there are any other pending changes Option 3: Manually

问题 I know similar questions have already been asked. But, I believe my issue is due to a mistake I have previously made and therefore is different: let me explain. Everything was working smoothly, as I could: git add . all the files from my local repository. git commit -m "message here" to add messages to my commits. git push origin master to upload my files to GitHub. git push heroku master to upload my files to Heroku. However, at some point, I created a new branch locally called add-calendar

问题 I am a new git user and recently been handed with an out of date git repository to look after. This is the original state ( output by git show-branch): ! [cr232] CR 232 Release * [dev] Style Changes --------------- * [dev] Style Changes * [dev^] SMS 5.4 * [dev~2] Logo Change * [dev~3] SMS 5.3 * [dev~4] SMS 5.2 * [dev~5] SIT R-0.3.3 EDW SMS Layers * [dev~6] SIT Release R 0.3.0 +* [cr232] CR 232 Release +* [cr232^] Dashboard Fix +* [cr232~2] Release for system testing Note that there is a

问题 Is there a way to test if two diffs or patches are equivalent? Let's say you have the following git commit history, where features F and G are cleanly rebaseable to E: G / A--B--C--D--E \ F Due to limitations in our current deployment process , we have the following, somewhat related graph (it's not version controlled) G' / ------------E' \ F' F' and G' will ultimately be applied to the head E', in some to be determined order, so it would end up like ------------E'--G'--F' Is there a way to

问题 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 . What is the best way to version control my database objects? I'm using Visual studio 2005/2008 and SQL server 2005. I would prefer a

问题 Is it even possible? Basically, there's a remote repository from which I pull using just: git pull Now, I'd like to preview what this pull would change (a diff) without touching anything on my side. The reason is that thing I'm pulling might not be "good" and I want someone else to fix it before making my repository "dirty". 回答1: After doing a git fetch , do a git log HEAD..origin/master to show the log entries between your last common commit and the origin's master branch. To show the diffs,