mercurial

问题 What were the reason for chosing Mercurial as a basis of FogCreek Kiln, a source control management system with tightly integrated code review, and FogBugz integration? Why Mercurial, and not other (distributed) version control system, like Bazaar, Git or Monotone, or creating own version control system like Fossil (distributed software configuration management, including bug tracking and wiki) did? What were features that make FogCreek choose Mercurial as Kiln engine? 回答1: Here's an answer

问题 In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) do a few commits (M, N, O) master A---B---C \ newfeature-123 M---N---O 2. Pull new changes from upstream master: $ git pull (master updated with ff-commits) master A---B---C---D---E---F \ newfeature-123 M---N---O 3. Rebase off master so that my new feature can be developed against the latest upstream changes: (from newfeature-123) $ git rebase master master A---B---C---D--

问题 In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) do a few commits (M, N, O) master A---B---C \ newfeature-123 M---N---O 2. Pull new changes from upstream master: $ git pull (master updated with ff-commits) master A---B---C---D---E---F \ newfeature-123 M---N---O 3. Rebase off master so that my new feature can be developed against the latest upstream changes: (from newfeature-123) $ git rebase master master A---B---C---D--

问题 If I invoke hg tag test then hg id -r test returns the changeset that the tag points to, but the tag was actually added by the subsequent commit. How do I look up the changeset that actually added a tag (as opposed to the changeset that the tag points to)? Is it safe to assume that it will always be the child of hg id -r <tag> ? 回答1: Assuming that a tagged changeset only has one child (the one that adds the tag) then the following commands will get the changeset that adds the tag: // Get the

问题 I am using TortoiseHg. I did a false commit, and then another false commit. Both commits are in draft state (not yet pushed). I want to completely ignore this commits and go back as if they where never committed. Doing Rollback seems to only remove the last commit. How can I do that simple task? 回答1: In settings enable either the mq or strip extension, then in a changeset context menu use Modify History -> Strip 回答2: In a recent mercurial (since v2.8 I think), you can make changesets obsolete

问题 In a mercurial repo you can have a branch, tag and bookmark all with the same name. Which do you get if you do hg update foo or hg clone --updaterev foo somerepo I.e. what is the priority between branches, tags and bookmarks? Experiments show the order to be bookmark - tag - branch, but I can not find documentation for this. Can I rely on this? From hg help revsets you can find syntax to specify what you mean, e.g. branch(foo) (may need quotes depending on the name and also the shell). 来源：

问题 How do I check from the command-line whether a local tag mytag exists on a remote repository and is pointing to the same changeset? I believe that I can solve this problem once I solve the following sub-problems: How do I find out which changeset added a tag? How to find out whether a remote repository contains a changeset? 回答1: Based on the aforementioned sub-questions, I believe the following will work: // Get the changeset that the tag points to def referenced = $(hg id -q -r ${tag}) //

问题 I moved 2 files, since they were conflicting with the latest hg pull and I've already done these changes at my work computer. Now I'm at my home computer, and I don't care about my home version anymore and I want to get the "latest" from the repository, so I moved the files handler.py and model.py to handlerbackup.py and modelbackup.py and did an hg pull , expecting that Mercurial would recreate my files after the move, but it didn't. What should I do to recreate my deleted files from the

问题 We're having a big project (in terms of size), that we're trying to build using a Jenkinsfile that is checked inside the project itself. In order to conserve disk space and build times we try to minimize the number of copies, so what we would want is to use the folder where the Jenkinsfile is checked out, since that is already a repo fully cloned. Manually investigating, I've seen that there is a workspace@script folder created inside the job's folder. That is folder path that I would like to

问题 We have an active svn repository and we are planning a migration to mercurial. The idea is to create a new mercurial repo, sync the svn repo with it with history, create a teamcity build for it and move two developers onto mercurial solely to trial it out and make sure its all kosher. This means we need bi-directional sync between svn and mercurial. I have seen this link Syncing SVN to Mercurial using svnsync & hg convert -- misses svn:externals? which sort of describes a way but it is fairly