mercurial

问题 After updating TortoiseHg+Mercurial a while back I am starting to get .orig files after merges. I have looked at the solutions for removing/purging them but I am looking for a way to disable the files from being left behind. After doing merges fine without these files appearing I was wondering if this was something new that could be turned back off. 回答1: Update: According to the Mercurial config documentation the defaults section is deprecated. The Mercurial wiki is also particularly critical

问题 This is a difficult situation to explain, so bear with me. I have a Mercurial repository with 2 main branches, default and dev . Work is usually done in a named branch off of dev (a feature branch). There may be many feature branches at any one time. Once work is completed in that branch, it is merged back into dev . When the time comes to prepare a release, another named branch is created off of dev (a release branch). Sometimes it is necessary to exclude entire features from a release. If

问题 I have accidentally made a commit to my local repository. To be more specific, I committed changes to lots of files all at once, when I meant to commit them one at a time. How do I undo this commit and get my working copy back to the state it was before the commit so I can do what I should have done in the first place? I have not pushed or pulled or anything else since the commit. You may suspect this is a duplicate, so I will explain why the following questions are different, or do not

问题 You can use hg grep, but it searches the contents of all files. What if I just want to search the file names of deleted files to recover one? I tried hg grep -I file-name-pattern pattern but this seems to return no results. 回答1: using templates is simple: $ hg log --template "{rev}: {file_dels}\n" 回答2: Update for Mercurial 1.6 You can use revsets for this too: hg log -r "removes('**')" ( Edit: Note the double * - a single one detects removals from the root of the repository only.) Edit : As

问题 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

问题 Inspired by this answer, I wonder if there is a way to obtain the same behavior in Mercurial than the one obtained with the smudge/clean filters specified in the .gitattributes file for git . This is, applying some preprocessing to some files before committing, without affecting the working copy . You can find a proper description of what I mean in the git documentation on gitattributes in the filters subsection. Also, from the Pro Git book: It turns out that you can write your own filters

问题 Can someone pls advise why I'm getting NO CHANGES found at the end. Also, I'm getting an annoying message, " Username not specified in .hg/hgrc. Keyring will not be used. " Version tool: Hg latest version Server: Linux Workspace: ~/2012WS LinuxServer123:~/2012WS # hg clone http://LinuxServer123/hg/GigaTest/ Username not specified in .hg/hgrc. Keyring will not be used. http authorization required realm: Mercurial Repositories user: u123456 password: destination directory: GigaTest requesting

问题 Is Python generally slower on Windows vs. a *nix machine? Python seems to blaze on my Mac OS X machine whereas it seems to run slower on my Window's Vista machine. The machines are similar in processing power and the vista machine has 1GBs more memory. I particularly notice this in Mercurial but I figure this may simply be how Mercurial is packaged on windows. 回答1: I wanted to follow up on this and I found something that I believe is 'my answer'. It appears that Windows (vista, which is what

问题 I'd like to evaluate Mercurial for my working projects. But most of my projects very heavily rely on the presence of svn:externals-like support. I've searched over StackOverflow and googled for corresponding support in Mercurial. All I found is subrepo feature added in Mercurial 1.3, but the page for this feature said: subrepos are an experimental feature for Mercurial 1.3. So don't do this on mission critical repositories! I don't want to use something unstable. Can anybody shed some light

问题 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