version-control

问题 We get this error in Visual Studio 2005 and TFS very often. Can anyone help us pinpoint the cause for this message? The full message is: There appears to be a discrepancy between the solution's source control information about some project(s) and the information in the project file(s). To resolve this discrepancy it will be necessary to check out the project file(s) and update them. If the check out fails, however, and the solution is closed without saving, you will see this warning again the

问题 I have a document management system where documents can have multiple versions. Each version is saved and users can view version history. What I would like to know is: What datatype should I use for version numbers? Decimal, Float or Double? I'm using .NET and C#. Version numbers start at 0.1 and each published major version will be rounded to the next whole number. i.e. 0.4 goes to 1.0 and 1.3 goes to 2.0 etc. When a version numbers hits 0.9 and a minor version is added I would like the

问题 I have 2 branches, master & feature . Master occasionally receives small tweaks that are needed to go live quickly. Once these tweaks are done, master is rebased into feature so that feature is kept up to date. The files changed on master are generally not related to the bulk of the development on feature but I've been getting a high number of complicated 3 way merge conflicts. After looking at the commit log of feature , I've found the problem to be several duplicates and I'm attempting to

问题 We are doing development for automation code. Our code automates the company's products and is synced to a particular product version. Currently, we have 1 big Git repository with multiple branches in it - v1.0, v1.1, v2.0 (automation for version 1.0 goes in v1.0 branch, and so on). What are the advantages and disadvantages of having these in a single repository with branches vs. keeping each version code in a separate repository ? Both solutions can work, the answer i'm looking for is a list

问题 I have a client's Django project that I'm developing locally, using Mercurial for version control. I push my local repository to my personal remote server (where I keep all my projects) and then when I come to deploy it (on whichever web server) I clone that respository there from my personal server. This works fine on most servers (where I have total control) but I have a few projects where I'm deploying on to WebFaction. WebFaction is great, but a little unusual with it's setup, as I need

问题 I have a client's Django project that I'm developing locally, using Mercurial for version control. I push my local repository to my personal remote server (where I keep all my projects) and then when I come to deploy it (on whichever web server) I clone that respository there from my personal server. This works fine on most servers (where I have total control) but I have a few projects where I'm deploying on to WebFaction. WebFaction is great, but a little unusual with it's setup, as I need

问题 I work on different projects that use different source control providers. Subversion, Git, TFS, etc... To work on Subversion, I've installed AnkhSVN. To work on Git, I've installed the Git Source Control Provider To work on TFS, ...well, you get the idea. The source control information is saved as part of the solution file. Yet, invariably, when I open a new project, Visual Studio keeps using whatever the last source control provider selected was. It doesn't seem to pick it up from the

问题 What is the maximum revision number supported by SVN? The repo is of type FSFS, hosted on a Fedora box. Thank you, 回答1: If you're using a 32-bit computer it's 2147483647, that's 2 31 -1, the maximum value of a signed 32-bit integer. For a 64-bit computer, it's... more. In any case, it should be enough for any practical purpose where humans are doing commits. In practice, you're probably going to run out of disk space or your directory indexes become too slow before you hit the maximum

问题 I am working on a research to study merges in open source projects. I recently asked How can I find all the commits that have multiple parents in a Mercurial repository?, and got a very good answer. Now I need to narrow my query to only find the commits that had conflicts. With conflicts I mean that the same file was modified in the two contributing commits. Also, it would be very useful if I can find a mercurial or bash (grep, awk?) command that gives me only those commits in which the same

问题 Working on a bit of a sticky problem and was hoping for some help from the community. Basically, our dev team is split up into two teams, lets say "Red" and "Blue" 3 repos: 1: Master 2: Red >> Clone of master 3: Blue >> Clone of master Each developer is cloning red or blue on their local machine where they are working. Both teams are working on various tasks for our main application. Each team has a clone of our Shared "Master" Repository on which they are applying their changesets. The