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
0
votes
1 answer

Create patch for series of existing changesets that were created without using MQ?

I've recently started to work on an open source project which uses Mercurial. I'm a new user to Mercurial, so I read the HG book and started working. My goal was to write code and always pull and merge changes from the upstream so I can stay…
Grigory
  • 992
  • 2
  • 18
  • 34
0
votes
1 answer

Using git on a Mercurial Queue Directory

I have got a folder containing a list of diff files in a Mercurial queue (mq) format and I want to apply these patches. At first I tried git am --patch-format=hg -- "path/to/files/", but this gave me the error Patch is empty. Was it split wrong?. …
Strategy Thinker
  • 343
  • 1
  • 3
  • 15
0
votes
1 answer

How can one remove changesets from revision history of MQ repository?

I have a Mercurial repository. It has a patch queue (which itself is a repository containing patches). Unfortunately I have performed too many unsightly commits to MQ (with hg commit --mq command). If I run hg history --mq command, it will print…
0
votes
1 answer

Difficulty splitting mercurial patches up

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…
David Corley
  • 710
  • 5
  • 17
0
votes
1 answer

Mercurial log for MQ

I can use hg log with either --stat or -p to see affected files and diff version for the revisions. Is there something like that for patches sitting in MQ ? I would like to see what changes would be brought by a particular patch without applying it…
EvgeniySharapov
  • 3,078
  • 3
  • 27
  • 38
0
votes
1 answer

What is an applied patch in a Mercurial queue?

The documentation is littered with mentions of "applied patches", i.e. in hg qfold, it says "Patches must not yet be applied." How do I apply a patch, and how do I know when a patch is applied? This concept doesn't seem to appear in the output of hg…
kiminoa
  • 2,649
  • 3
  • 16
  • 17
0
votes
2 answers

Mercurial Queues: cannot commit and cannot qpop

I have added some debugging stuff to an existing working code and made a mq patch. (The debugging stuff in fact breaks the application, but I need it to debug the features that I add, this is why I want to have one unit responsible for the changes,…
18446744073709551615
  • 16,368
  • 4
  • 94
  • 127
0
votes
2 answers

Mercurial Queues: How to reorder patches efficiently

Suppose I have the follow patches in my mercurial queue: $ hg qser -v 0 A p1 1 A p2 2 A p3-StupidPatch 3 A p4 5 A p6 ... 15 A p15 Now suppose that I want to do is reorder the patches so that p3-Stupid patch is the last patch. IE: $ hg qser…
sixtyfootersdude
  • 25,859
  • 43
  • 145
  • 213
0
votes
2 answers

How do I convert a mercurial queue patch to uncomitted changes in my working copy?

I have an applied patch in my Mercurial queue, how do I convert this patch into uncommited changes in my working copy (as though I'd never created the patch using qnew)?
crobar
  • 2,810
  • 4
  • 28
  • 46
0
votes
2 answers

MQ patches on renamed files

I have some MQ patches and someone else has renamed the files that I am working on in the repository. Now I don't know how to merge my patches for renamed files (after pulling changes). Do I have to manually fix my patches for all renamed files?
aminfar
  • 2,297
  • 3
  • 27
  • 37
0
votes
1 answer

How can I qfold the currently applied patches?

I have two Mercurial patches applied with MQ. I would like to fold them into one, but qfold requires the patches to be un-applied. Why? And how can I fold them without explicitly popping?
Nicolas
  • 2,321
  • 4
  • 21
  • 32
0
votes
2 answers

how do I push most recent commit in HG

I have done some local commits. But I want to push the most recent ones like 4977 and 4978 excluding the previous ones. 4948 local commit 1 is the ancestor of all commits Can some one tell how do we do that in HG 4978 local commit 4 | | …
Patan
  • 17,073
  • 36
  • 124
  • 198
0
votes
1 answer

How to maintain 2 same repositories in different OSes?

I have a cloned Mercurial remote repo on Linux. Some features I work on need to be tested on Windows also. So, I cloned the same remote repo in both Linux and Windows. They are the same repositories, which must have the same changes I make. The…
batman
  • 5,022
  • 11
  • 52
  • 82
0
votes
1 answer

How to visually (side by side) view a patch generated by Mercurial Queues on a repo?

I use a Mercurial Queues to create patches while I work on the repository. So, let's say after I'm done with a patch, I do hg qrefresh and export the patch to some file I want. So, now I have a patch file. How do I view this visually view this…
batman
  • 5,022
  • 11
  • 52
  • 82
0
votes
2 answers

hg aborts on outgoing mq hook

I'm trying to run hg pull -u, but it gives the following error: searching for changes /bin/sh: !: not found abort: preoutgoing.mq-no-push hook exited with status 1 my .hgrc includes this hook, which I'm guessing is causing the…
craq
  • 1,441
  • 2
  • 20
  • 39