version-control

问题 There've been several questions recently about skipping changes when maintaining release branches in Mercurial. For example: Mercurial: Branch specific changes keep coming back after dummy merge Why are Mercurial backouts in one branch affecting other branches? Since it was introduced in 2.0, I've wondered about using graft to avoid this problem. Given a revision tree like this: A---B---C---D---E---F---G---H---I---J Suppose we need to create a release branch that skips the Evil change E . hg

问题 I am supporting a number of .Net developers who are using Subversion to version control their work, but we have been running into a number of issues that seem to revolve around the additional files that Visual Studio uses to manage projects, do debugging, etc. Specifically, it seems that these files are causing conflicts due to the fact that they are already in the repo. I know how to get them out and how to handle them, but I need to know what "they" are first. So, what are the files

问题 I want incremental updates of my library files to immediately be applied in all of my projects using them, without having to perform an extra step every time for every one of my projects (such as updating a sub-repository or a JAR file). 回答1: With the library folder in the LIBS_DIR environment variable: // settings.gradle include ':app', ':lib1', ':lib2' project(':lib1').projectDir = new File(System.getenv('LIBS_DIR'), 'lib1') project(':lib2').projectDir = new File(System.getenv('LIBS_DIR'),

问题 I have been using Merging heavily on master branch. But recently for a feature development in my situation merging seemed complicated for the project history. I came across Rebasing which solves my problem. I also came across the golden rule of rebasing while solving the problem. I also used Stashing at times, it worked, but I feel like the same thing could have been achieved with merging as well. Although I use these commands, I feel like if someone can explain the conceptually outstanding

问题 I was wondering which command is executed internally when we select 'Delete' from Clearcase explorer context menu. Is it rmname, rmelem or rmbranch? We use base CC. I am a developer and since I don't want to do any removal related experiments within our CC setup, I decided to ask the question here. 回答1: It is cleartool rmname. It will checkout for you the parent directory, derefence the file (rmname) and checkin the parent directory. See "About cleartool rmname and checkouts" The Delete

问题 I want to use TFS in Android Studio. I installed Visual Studio Team Services and then in TFVC of Settings, i should to select TF executable file, i downloaded TFE of below link but when i Test TF exe file, i give below error. The specified path does not lead to a valid TF executable. Downloaded link: https://github.com/microsoft/team-explorer-everywhere/releases How can solve this problem? 回答1: Please double check if you have follow below steps: You must have the TF command line tool

问题 I have a project in Mercurial with a group of committers. Unfortunately, some of the committers has changed names several times, e.g. first it was "nickname", and then it became "Name Surname ", and then something else. Most of the repository analysis tools expect committer to have same name over the course of the project, so ideally I'd like to rename committers of previous revisions in our main repository and have everyone make a fresh clone. Is it possible? Are there any other ways to deal

问题 I really don't like the git staging area, it just makes my life unnecessarily confusing. Is it possible to disable it so that all edited and new files are in a single context? So that git diff shows the diff between the repository and my working directory (and I don't have to also type git diff --cached) and so that git ci checks in my whole working copy (not just the part that's staged). If not, alternatives (like setting up cofigurations) so that it appears that I don't have a staging are

问题 I'm an avid git user; I use git in development; in staging, but not in production. Are there any good reasons not to use git below the web root (/var/www/) in a production environment? I've been considering either using the master branch as the production branch, or creating a production branch. push production master sounds so nice... 回答1: so nice... and yet so wrong somehow. In production environment, you need to be concerned with: access security (how do you copy/deploy a delivery)

问题 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 . does anyone have a good idea for what I might use ? 回答1: Its not specific to Delphi but SVN is the way to go for version control.