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
1
vote
1 answer

Mercurial patch queue collapse

I am using the patch queue to achieve something like what this person asked here: Why can't I rebase on to an ancestor of source changesets if on a different branch? However, what I would like to do, is that when I have all the patches in the queue,…
steprobe
  • 1,659
  • 3
  • 17
  • 32
1
vote
0 answers

How to ascertain if a mercurial patch is already applied

I am using mercurial queues to apply patches. I have the .patch files and series file. I copy those into .hg/patches directory. Then I run the following: hg qpush -all Now, say patch A fails. I investigate and find that patch A was already…
Murtaza Raja
  • 309
  • 4
  • 15
1
vote
2 answers

Are Mercurial Queue specific commands equivalent to Mercurial commands with a --mq parameter?

I'm trying to learn Mercurial Queues and I'm confused by there being both a bunch of "hg q*" commands and also many normal hg commands with the "--mq" parameter. I think that the --mq parameter is meant to replace some of the q* commands, but I'm…
Brandon Leiran
  • 5,343
  • 3
  • 20
  • 17
1
vote
1 answer

hg qnew: abort: working directory revision is not qtip

I am trying to create a new patch. So I wrote: hg qnew -e -f mypatch.patch But I get a message: abort: working directory revision is not qtip What exactly is the error here and how to resolve it?
blackmamba
  • 1,952
  • 11
  • 34
  • 59
1
vote
1 answer

How to edit specific hunk of MQ patch?

My use case: I noticed that I made unnecessary edit in earlier revision and I want to discard one hunk from patch, and preserve all other changes for this file. I've tried to edit the patch inside .hg/patches/ and then hg qrefresh, but after that…
Gill Bates
  • 14,330
  • 23
  • 70
  • 138
1
vote
1 answer

Why does .hgignore appears in my patches?

I use Mercurial Queues to work with patches. There was no .hgignore initially. I'm not sure if I first created an MQ patch and then created my .hgignore or the other way round. (By "creating a patch" I mean hg qnew patch_name -m "...") Anyway, I…
batman
  • 5,022
  • 11
  • 52
  • 82
1
vote
1 answer

Is it possible to (easily?) re-write the paths within a Mercurial Queue patch?

I've got some MQ patches with work implemented in file path project/feature_a, but I need to move these changes to project/feature_b. Is there an easy way to do this?
moswald
  • 11,491
  • 7
  • 52
  • 78
1
vote
1 answer

How to push just one specific patch in Mercurial Queues?

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…
batman
  • 5,022
  • 11
  • 52
  • 82
1
vote
1 answer

How to work on multiple patches at the same time using Mercurial Queues?

Lets say, I have 2 bugs to fix : bug1 and bug2. I start with bug1 and in the midst of fixing it, I go to bug2 and half fix it. I return to bug1 and again partially fix it and again go to bug2. Like this, after much switching, I finish fixing both…
batman
  • 5,022
  • 11
  • 52
  • 82
1
vote
1 answer

Mercurial: Revert "commit action" changes

Suppose I have made a change to a file, hg status show it as modified. Now I want to commit. Before I can do so I accidentially hg remove my file. Mercurial now would remove my file on the next commit, hg revert would retain it from removal, my…
Johannes Rudolph
  • 35,298
  • 14
  • 114
  • 172
1
vote
3 answers

Using mercurial's mq for managing local changes

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…
Jim Hunziker
  • 14,111
  • 8
  • 58
  • 64
0
votes
1 answer

Why refreshing my mq patch leaves modified files in the working directory?

Please, observe: PS Z:\dev> hg version Mercurial Distributed SCM (version 1.9.2) (see http://mercurial.selenic.com for more information) Copyright (C) 2005-2011 Matt Mackall and others This is free software; see the source for copying conditions.…
mark
  • 59,016
  • 79
  • 296
  • 580
0
votes
1 answer

Undoing accidental hg amend on top of Mercurial queue

The following sequence of commands requires that the Mercurial Queues exension be enabled, and also the Evolve extension (for hg amend, alias hg refresh). This combination of commands messes up the existing Mercurial queue, making the commit…
Faheem Mitha
  • 6,096
  • 7
  • 48
  • 83
0
votes
0 answers

abort: No such file or directory: '/mnt/factotum/rpc' [Mercurial]

I am having a problem in taking a clone, push or pull. When I do these, I get an error: abort: No such file or directory: '/mnt/factotum/rpc' How can I resolve the issue? OS: Ubuntu 16 Tool: Mercurial, BitBucket
0
votes
1 answer

Mercurial Queues, patch is getting auto applied

I have two patches: patch1 patch2 When I apply patch1, that is the only thing that gets applied. When I do hg qpop and then do hg qpush patch2, for some reason patch1 gets applied too. How can I make them independent from each other?
Saad
  • 49,729
  • 21
  • 73
  • 112