Stack Overflow
Stack Overflow

Questions tagged [mercurial-queue]

Mercurial Queues is a standard extension of Mercurial DVCS that manages changeset patches.

Mercurial Queues is a standard extension of Mercurial DVCS that manages changeset patches. It works similar to quilt, but is integrated with Mercurial.

More information:

97 questions
57
votes
4 answers

git equivalent to hg mq?

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…
John Weldon
  • 39,849
  • 11
  • 94
  • 127
35
votes
3 answers

Removing file from Mercurial MQ Patch

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…
Nathan Lee
  • 2,231
  • 2
  • 23
  • 26
20
votes
4 answers

How to enable Mercurial extensions (such as mq)?

I have installed Mercurial from the Ubuntu package repository. However I don't know how to enable extensions (q* commands). How should I do that? The help shows that enabled extensions: style (no help text available) I want to enable mq and hgk.
mahmood
  • 23,197
  • 49
  • 147
  • 242
20
votes
4 answers

What's the Git approach to publish a patch queue?

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…
sastanin
  • 40,473
  • 13
  • 103
  • 130
20
votes
5 answers

Perform an empty commit with mercurial

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…
HighCommander4
  • 50,428
  • 24
  • 122
  • 194
18
votes
2 answers

How do I convert a Mercurial queues patch to local changes only?

This answer shows how you can demote a commit to a patch, but how can I convert an mq patch to local changes only?
Lstor
  • 2,265
  • 17
  • 25
17
votes
2 answers

How to convert N local topmost commits to an MQ patch?

I would like to arrange my last commits as an MQ patch. All the commits are local (never pushed to the server), but not all the local commits are to be converted. Say, I did 10 commits (never pushed) and now I wish to convert the last 5 to a…
mark
  • 59,016
  • 79
  • 296
  • 580
17
votes
3 answers

How to manage concurrent development with mercurial?

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…
Geoffrey Zheng
  • 6,562
  • 2
  • 38
  • 47
14
votes
1 answer

How do I fold patches (qfold) in TortoiseHg 2.x?

I've seen a few tutorials that talk about qfold and how to do it in TortoiseHg 1.x, but I can't figure out where the button for folding patches is in 2.x. The official documentation doesn't mention it at all. Does anybody know how to do it?
Mike
  • 7,500
  • 8
  • 44
  • 62
13
votes
1 answer

Mercurial: how to recover from an interrupted "qpop -a"?

I've imported a couple of revisions into the queue and tried to pop them all. Unfortunately, according to some other Mercurial client accessing the same repository, hg qpop -a didn't complete successfully: > hg qpop -a popping 115.diff popping…
mstrap
  • 16,808
  • 10
  • 56
  • 86
12
votes
3 answers

Mercurial - Working with Queues similar to Shelves?

I've recently started working with MQ as I like the idea of working on isolated patches and committing without affecting the repo until the changeset is refined enough. Before that, I used to work with Mercurial's shelves extension, but found it a…
sa125
  • 28,121
  • 38
  • 111
  • 153
10
votes
1 answer

Mercurial Queues: combining patches

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…
Eamon Nerbonne
  • 47,023
  • 20
  • 101
  • 166
10
votes
2 answers

How to avoid accidentally 'hg push' instead of 'hg qpush'?

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,…
Sergio Acosta
  • 11,418
  • 12
  • 62
  • 91
10
votes
5 answers

How do I split work into multiple patches with mercurial queues?

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…
Marcelo Cantos
  • 181,030
  • 38
  • 327
  • 365
9
votes
3 answers

How to swap Mercurial Queues in and out of a repository

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…
Kwan Cheng
  • 696
  • 3
  • 12
  • 16
1
2 3 4 5 6 7