Tagged Questions
33
votes
4answers
5k views
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 ...
24
votes
3answers
2k views
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 ...
16
votes
3answers
1k views
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 ...
9
votes
3answers
2k views
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 ...
8
votes
3answers
530 views
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 ...
7
votes
2answers
500 views
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) ...
7
votes
2answers
691 views
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 ...
7
votes
2answers
1k views
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 ...
6
votes
2answers
870 views
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. ...
5
votes
3answers
634 views
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 ...
5
votes
1answer
891 views
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 ...
5
votes
1answer
502 views
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 ...
5
votes
2answers
303 views
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 ...
5
votes
2answers
348 views
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 ...
4
votes
4answers
1k views
Mercurial Patch Queue Use Cases
I use mercurial patches in the following cases:-
When I need to pull from a remote repository and have outstanding uncommitted changes. Then I simply create a patch, qpop it, pull from the remote ...
