mercurial

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

问题 In my mercurial.ini file, I call a global hgignore file like this: [ui] ignore = ~/hgignore.ini This refers to a hgignore.ini file which is in the same directory as the mercurial.ini file. Does the local hgignore override the global hgignore? If so, is it recommended to have a single global hgignore with relevant sections marked or have a global hgignore file for general patterns and individual local hgignore files for special patterns pertaining to the particular repo? By global hgignore

问题 I try to publish multiple existing mercurial repository-locations though XAMPP Apache via CGI Python script hgwebdir.cgi ... as in this tutorial https://www.mercurial-scm.org/wiki/HgWebDirStepByStep I get the following error from the apache error logs, when I try to access the repository path with a browser: Premature end of script headers: hgwebdir.cgi [Tue Apr 20 16:00:50 2010] [error] [client 91.67.44.216] Premature end of script headers: hgwebdir.cgi [Tue Apr 20 16:00:50 2010] [error]

问题 I have an SVN repository which contains a number of loosely-related subfolders in its trunk. I would like to convert it into HG repository, turning each of these subfolders into a separate HG subrepo. At the same time, I would like to access combined change log of all subrepos in the top level repo. So I created an empty HG repo, some empty subrepos, linked their names and locations by .hgsub , checked that I can clone this repo together wth its subrepos to another comp ... Then I tried to

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

问题 Let's say I have the following workflow with Mercurial: stable (clone on server) default (branch) development (clone on server) default (branch) bugs (branch) developer1 (clone on local machine) developer2 (clone on local machine) developer3 (clone on local machine) feature1 (branch) developer3 (clone on local machine) feature2 (branch) developer1 (clone on local machine) developer2 (clone on local machine) My main line of development which is always in a release ready state is 'default'. So

问题 I can't get my head around how I can get only the files that were changed in my last revision, and not the complete repo, which i get by using Clone. This would be super helpful to for instance, deploy the last changed files. What do I do? Thanks 回答1: Martin has the right way to get a list of what files have changed in a revision, and I've upvoted his answer, but just to expand on why your question is a little off: In Mercurial every location has a full copy with all changes. If you're going

问题 The closest answer is this one, and here's a line from it: hg revert -r <oneRevBack> fileName The last thing is to get <oneRevBack> other than using hash. I would dream of just typing <-1> . 回答1: The hg syntax for "one rev back" is tip^ , where tip is the latest revision and ^ means "parent". If your working directory is not at tip, use .^ , where the dot means "current revision". 来源： https://stackoverflow.com/questions/20971306/hg-how-do-i-revert-a-single-file-several-commits-back

问题 I was wondering if it was possible to pull a private mercurial repo to a server without access to hg. I have SSH access, but do not have the ability to install HG. I was thinking some kind of Python script that used http access or something, but I wasn't sure. I was also thinking this might only be possible with public repos. I am currently hosting the projet on BitBucket. Thanks for any input! 回答1: What good would getting the repository be if you don't have mercurial installed and can't