mercurial-queue

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 qdelete -k temp-1.patch $ make hello cc hello.c -o hello hello.c: In function ‘main’: hello.c:4: error: syntax error at end of input make: *** [hello] Error 1 $ echo '}' >> hello.c $ make hello cc hello.c -o hello $ hg qrefresh # Recover the stashed changes. $

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 However its starting to get cumbersome because our patch queue contains 100+ patches named like windows-memory-optimization.patch +windows, unix-memory-optimization.patch +unix, windows-io-experimental-bug-fix.patch +windows, etc etc. We organized it as groups in the

This is what I did : hg init hg qnew -m "p1" p1.patch ; some changes hg qrefresh hg qpop hg qnew -m "p2" p2.patch ; some changes hg qrefresh hg qpop Now those 2 patches were separate features and have nothing to do with each other. They need to be independent of each other. Now I do (because I want only the 1st feature) hg qpush p1.patch It says : applying p2.patch applying p1.patch and it gives me both the changes I made ! Am I doing something wrong? It pushes other patches also when I tell it to push a specific patch. Lazy Badger You forgot one thing: set of MQ-patches is queue (FIFO queue).

With with Mercurial queues extension, I can make an empty commit with some commit message like so: hg qnew patch_name -m "message" Is there a way to do this without Mercurial queues? I tried simply: hg commit -m "message" but hg just says "nothing changed" and doesn't do the commit, and I don't see any "force" option that would override that. If you're wondering about my motivation for doing this: we have testing infrastructure where you push to a special repository and it will trigger automated tests to run. You need to put a special string into the commit message of the tipmost commit that

I am used to Mercurial mq extension to maintain a set of custom patches over the upstream. They can be published as a separate repository aside from the upstream. Now in git I use private branches and rebase , and it works well until I want to share my patches with someone else. In Mercurial the patch queue is an independent repository, and can be published as usual. Bitbucket even offers a patch queue feature to link it to the parent repository. In Git, if I publish a private branch with my patches, I lose the ability to rebase them anymore (unless I break merges), yet the patches need to be

I just started using Git alongside Mercurial to familiarize myself with Git. I use the mq extension in Mercurial extensively to manage local patches, and I'm looking for a Git equivalent. Should I just use Git branch? Or are there better ways to manage local patches that enable easily applying and removing the patches? Thanks, Jakub Narębski Check out "Patch-management Interface layers" section of Interfaces, Frontends And Tools page on Git Wiki. There are listed two patch management interfaces, roughly equivalent to Mercurials 'mq' extension : StGIT (Stacked Git), older of the two, written in