I have a local mercurial repository with some site-specific changes in it. What I would like to do is set a couple files to be un-commitable so that they aren't automatically committed when I do an hg commit with no arguments. Right now, I'm doing complicated things with mq and guards to achieve this, pushing and popping and selecting ...
I have a platform neutral mercurial code repo called "Simulator" and want to apply patches that target specific platform's optimizations before a build. According to the guide we can accomplish this by the use of patches with guards. Windows Experimental.patch +windows Unix Experimental.patch +unix Mac Experimental.patch +mac How...
If I've been churning away at the code for a while, and forgotten to create a patch series as I go, how do I create the patch series retrospectively? So far the only thing that comes to mind is: # Prepare and test the first batch of changes. $ hg qrecord -m 'first batch' 1.patch $ hg qnew -m 'stash downstream changes' stash-1.patch $ hg...
I have large MQ patch applied in Mercurial. What has happened is I have done qrefresh and included files in my patch that I do not want to include. Is there a way to remove the changes to these file from my patch with out manually editing it? In this case if I was just working without MQ, all I would have to do is hg revert. ...
For those of you that use Mercurial with the MQ extension: This is the second time I accidentally submit changes to the central repository (hg push) instead of applying a patch to my working directory (hg qpush). I think this is very unfortunate, because it is a very simple error to make and has very severe consequences (the least havi...
I've been playing with Mercurial and mercurial queues, and now have a fairly reasonable working version. However, before I submit a patch, I'd like to take that spagetti-history and merge it into discrete, logical steps, rather than the semi-overlapping repeated do-undo-redo-slightly-differently mess it is now, if only to reduce the num...
I have to run a dozen of different build tests on a code base maintained in a mercurial repository. I don't want to run serially these tests on same repository because they modify a set of common files and I want to run them in parallel on different machines. Also, after all tests are run I want to have access to latest test results from...
I want to use Mercurial to capture changes made to the vanilla installation of a piece of software we use. Everytime we upgrade the software, we need to manually edit the various configuration files and add 3rd party libraries that we use in the current version of the software. Creating patches for the configuration files changes are fin...
I've got a web application I want to be able to create patches for. Specifically I want to create patches for enabling specific functionality in the web server. JAVA_OPTS="-Xms128m -Xmx256m $JAVA_OPTS -Djava.awt.headless=true -Datlassian.standalone=JIRA -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true " # Perm Gen size nee...
I use mercurial queues and sometimes I forget to set my message with a hg qrefresh -m ... and forget to check before I run hg qfinish and I get the message patch MyPatch finalized without changeset message. Is there any way I can make qfinish abort if there is no message? The only way I found to fix this after I do that is to generate ...
This is a best practice question, and I expect the answer to be "it depends". I just hope to learn more real world scenarios and workflows. First of all, I'm talking about different changes for the same project, so no subrepo please. Let's say you have your code base in an hg repository. You start to work on a complicated new feature A...
The process of creating patches in Mercurial is as follows: Create patch with qnew -> Make changes -> Refresh patch What if I have already made (uncommited) changes and I want to add them to the queue? ...