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
9
votes
2 answers

MQ vs. branches in Mercurial

I've been working with Mercurial now for some time. When making (private) changes to some third party software, in the past I always created a separate named branch for these changes. When the upstream code updates, I simply merge it into my named…
Sebastian Krysmanski
  • 8,114
  • 10
  • 49
  • 91
9
votes
3 answers

How to undo "hg qnew"?

I issued hg qnew without realizing that it includes any outstanding changes into the patch. I'd like to back that out and pick only specific changes using hg qrecord. How can I undo qnew?
Petr
  • 62,528
  • 13
  • 153
  • 317
8
votes
2 answers

How to use mercurial merge functionality for rejected hunks in a patch queue, without the deprecated qsave?

I have a repository and am using mq patch queue for unfinished changes. The patch queue is also under version control. Let's say I have 2 patches p1 and p2 (applied in that order). Now I make a change on p1: hg qnew p1 ... hg qnew p2 ... hg qref hg…
mr_georg
  • 3,635
  • 5
  • 35
  • 52
8
votes
2 answers

In Mercurial Is it "safe" to pull when a mq patch is applied?

The go programming language has a page on code reviews using mq and it states: "Since pulling, pushing, updating and committing while mq patches are applied can damage your repository". I understand why pushing or updating could be an issue, but is…
Brandon Leiran
  • 5,343
  • 3
  • 20
  • 17
7
votes
2 answers

Updating Commit Message in Mercurial MQ extension

After using hg qnew and hg qrefresh to create and update a patch that I want to apply to my repository, but the commit message that I wrote when I did hg qnew was not very good, it did not reference the ticket number from trac, and I would like to…
Jerub
  • 41,746
  • 15
  • 73
  • 90
6
votes
1 answer

How-to multiple hg mq patch queues (in one repository vs. many subrepos)

I am trying to set up my workflow with MQ as described in the MqTutorial and in the HGbook Chapter 13. The part I struggle with is how to have multiple patch queques under version. Alternatives: I. Create a separate repository for every queue. To…
Cilvic
  • 3,417
  • 2
  • 33
  • 57
5
votes
4 answers

What to do when you have too many changes within a single patch in an hg mq the patch queue?

The purpose of the hg mq plugin is to be able to make perfect commits to your repository, not confusing the changes that you made in your absent-minded ADHD induced rambling through your code; For instance.... I'm working on bug x when I notice bug…
leeand00
  • 25,510
  • 39
  • 140
  • 297
5
votes
2 answers

Is `qrefresh` considered harmful?

The qrefresh command in the MQ extension don't make sense to me. I'll explain my assumption: If you don't know on which revision should a certain patch be applied, it have a very little value. You just can't theoretically know what does the rejects…
Elazar Leibovich
  • 32,750
  • 33
  • 122
  • 169
5
votes
2 answers

Adding uncommitted change into a new patch with Mercurial queues

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?
Casebash
  • 114,675
  • 90
  • 247
  • 350
5
votes
3 answers

How can I add complete binaries to a Mercurial patch?

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…
David Corley
  • 710
  • 5
  • 17
5
votes
2 answers

Is there a command to move a patch between patch queues?

I realize patch queues have a pretty simple implementation, and you can move stuff manually, but is there a command to move a patch between two queues?
fakeleft
  • 2,830
  • 2
  • 30
  • 32
4
votes
1 answer

How to untangle/undo a merge over applied MQ patches?

I accidentally merged a branch into a workspace with applied patches. How do I clean up this mess? Do I have to clean the merge (hg up -C) or is there some way to save my merge?
Aaron Digulla
  • 321,842
  • 108
  • 597
  • 820
4
votes
2 answers

How to retrieve an accidentally deleted patch in Mercurial with MQ

I had two patches in series, neither one applied, and I accidentally called qdelete on the wrong one. Is there any way to reverse this operation and get my patch back? I had a huge amount of work in this one!!!
David C
  • 3,610
  • 3
  • 21
  • 23
4
votes
2 answers

Mercurial Queues: Merging Patches from Multiple Repositories

I am using Mercurial Queues on a repository, and have placed those patches in a patch repository. Another contributor has cloned my patch queue and made changes of their own. I would now like to merge their changes in my local patch repository. …
J. Ryan Stinnett
  • 801
  • 8
  • 13
4
votes
0 answers

Mercurial subrepositories with MQ

Sometimes when I am working on a code change, I need to make a corresponding change to the shared library code in my repository, which is itself a subrepository. When I want to commit the changes, I do so in the parent repository and Mercurial takes…
Tyler Butler
  • 136
  • 5