mercurial

问题 I have successfully imported patches without having conflicting changes. But when I try to import patch with conflicting changes it throws an error saying "Hunk #1 FAILED at 11.. ". There is no option to merge changes. Is there any other way to accomplish this? 回答1: Manual resolution The latest versions of TortoiseHg 2.1 have tools for helping you resolve rejected chunks from patches. When you apply a patch and it has rejections, for each file with rejections it asks if you want to resolve

问题 This morning I discovered that my co-worker had merged the wrong way between two branches in mercurial --we have a ver5 and ver6 branch, with extra files in ver6. Is there any way (a serverside hook probably) to enforce that the children of any ver5 node be from ver5? 回答1: Rather than post twice, would my answer to " Mercurial: allow merge from a release branch to the default one, but not vice versa " help? https://stackoverflow.com/a/19926324/1025457 回答2: Whether you have ver5 merged into

问题 This is a but of a part 2 in trying to convert an SVN repository to a Mercurial one command is: hg convert file://c:/svnrepository but, the output I get is: assuming destination svnrepository-hg initializing destination svnrepository-hg repository file://c:/svnrepository does not look like a CVS checkout file://c:/svnrepository does not look like a Git repo Subversion python bindings could not be loaded file://c:/svnrepository is not a local Mercurial repo file://c:/svnrepository does not

问题 We have our source code stored in Kiln/Mercurial repositories; we use MSBuild to build our product and we have Unit Tests that utilize MSTest (Visual Studio Unit Tests). What solutions exist to implement a continuous integration machine (i.e. Build machine). The requirements for this are: A build should be kicked of when necessary (i.e. code has changed in the Repositories we care about) Before the actual build, the latest version of the source code must be acquired from the repository we are

问题 Can anyone tell me what this Mercurial error means? untracked file in working directory differs from file in requested revision This occurred when doing an hg fetch: C:\myapp>hg fetch ssh://hg/myapp-v1 pulling from ssh://hg/myapp-v1 searching for changes adding changesets adding manifests adding file changes added 93 changesets with 693 changes to 78 files (+1 heads) updating to 797:0df7dbe7dc06 196 files updated, 0 files merged, 196 files removed, 0 files unresolved merging with 704

问题 Is there any good tool that computes the number of changed lines of code over a certain time period in a mercurial repository? Something along the lines of statsvn would be great, but anything counting the number of changed lines of code within 6 months will do (including a clever combination of arguments to hg log). Thanks. PS: Please do not discuss the purpose of measuring this number ;) 回答1: The hg churn extension is what you want. You can get visual results with hg activity or hg chart.

问题 Having two branches, how can I find the latest revision(s) where the two branches were merged? Is there a standard Mercurial command to do that? This is the same as question How to find the common ancestor of two branches in SVN? , but for Mercurial instead of subversion. I didn't understand why Lazy Badger's answer was the right one, so I had to make a little drawing, and now I get it: When two branches are merged, they are not really "merged", but the changes from one branch are integrated

问题 I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience with trying both in a .NET development environment? 回答1: I have been using Mercurial for over a year now for doing .NET development, and it has been working out

问题 I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience with trying both in a .NET development environment? 回答1: I have been using Mercurial for over a year now for doing .NET development, and it has been working out

问题 I'm having problems with pushing to mercurial repository: $ hg push pushing to https://user:***@hg.domain.com/X_repo searching for changes abort: authorization failed The same URL (with the same credentials) is accessible through the web browser. Also, I tried it without embedding usr+pass into the URL. HTTPS is correctly configured, I tried both Basic and Digest auth -- without a luck. Pulling (through HTTP) works fine. I'm using hgwebdir to serve my repo. What else should I check? I found