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
3
votes
3 answers

Mercurial Queues - backing up and sharing uncommitted patches

I'm trying to understand how to push my mercurial patches to a remote repo (say, bitbucket.org), without having to apply them first (actually committing them). My motivation is to first have a remote backup to my work before it's final, and also to…
sa125
  • 28,121
  • 38
  • 111
  • 153
3
votes
2 answers

Setting --keep-changes as default for `hg qpush` and `hg qpop`

Mercurial Queues recently got a new feature, which allows mq patches to be pushed and popped when there are local changes, provided the patches don't conflict with the local changes. This is controlled by the --keep-changes flag. I'd like to make…
Faheem Mitha
  • 6,096
  • 7
  • 48
  • 83
2
votes
4 answers

How can I keep some modifications from propagating in mercurial?

I am developing a web database that is already in use for about a dozen separate installations, most of which I also manage. Each installation has a fair bit of local configuration and customization. Having just switched to mercurial from svn, I…
alexis
  • 48,685
  • 16
  • 101
  • 161
2
votes
1 answer

Efficient way to make a new patch from some of the current changes

I'm using mercurial queues quite alot, and I'm really happy with them, but there is one workflow which I find overly complicated. It happens sometimes that I'm working on a patch, and then I realize I have been working on something that should be in…
daniel kullmann
  • 13,653
  • 8
  • 51
  • 67
2
votes
2 answers

Creating a temporary named branch in Mercurial, then deleting it from existence

I'm toying with the idea of adding a "remote-run (personal build) for Mercurial" ability in the TeamCity Visual Stuio plugin. Since v6.5, TeamCity supports a "remote run branch trigger", where if a named branch matching the trigger in TeamCity is…
Igal Tabachnik
  • 31,174
  • 15
  • 92
  • 157
2
votes
2 answers

Interactive program to selectively exclude parts of a diff file

Is there a program (preferably available on Cygwin) which I can use to "filter" a diff file interactively? i.e. I want something like git interactive add, except that I want to operate on a diff file. I have already discovered filterdiff, but I…
fyhuang
  • 2,147
  • 5
  • 21
  • 24
2
votes
1 answer

What happens when I strip one version of a mercurial repository and try to synchronize with another one?

I know what happened to me when I did it. The synchronization was apparently successful, because no warnings were generated, but when I cloned the remote repository I saw that the synchronization didn't happen at all. I was using bitbucket as the…
Jader Dias
  • 88,211
  • 155
  • 421
  • 625
2
votes
2 answers

How to change a commit message in hg mq?

I have added 4 patches to my workspace. While creating these patches, I had used qnew -m "". Now I noticed that I have not given proper commit message. How to modify all the commit messages? I tried few things: $ hg ci; abort: cannot…
user2713461
  • 387
  • 2
  • 5
  • 16
2
votes
2 answers

Is it safe to use Mercurial Queues and the Share extension together as long as your working directories are on separate branches?

I've thought this through and I think I understand the implications, but I wanted to get a sanity check because the caveats on https://www.mercurial-scm.org/wiki/ShareExtension are pretty general. Specifically, the warning is "It's probably not a…
rationull
  • 465
  • 4
  • 9
2
votes
2 answers

hg abort: cannot refresh immutable revision

I'm using hg with the mq extension installed (I do not have the rebase extension to the best of my knowledge) After making a few changes and doing a few qdiffs, qrefs I am suddenly faced with this error, I am not sure how or why it occured, but I'd…
ffledgling
  • 11,502
  • 8
  • 47
  • 69
2
votes
1 answer

Mercurial: Export last n revision into MQ

is there an easy way to export last n commits into a new mq queue and strip the commits from the real repository? I do often start out developing a new feature, later realising I did something wrong/would want to use MQ to fold patches. I am…
Johannes Rudolph
  • 35,298
  • 14
  • 114
  • 172
2
votes
1 answer

Backout unwanted changes and make a patch out of them

I'am collaborating with someone on remote repo. We realized that changes I made should be removed out of repo. But those changes are in many changesets and mixed with someone's changes. We decided to remove my changes just before I commit another…
Memke
  • 684
  • 1
  • 7
  • 24
1
vote
1 answer

Is there any patch tools that work well with mercurial, when patch-based workflows fail causing .rej hunks in your repo

I am looking for a better patch tool than the ones built into Mercurial, or a visual tool to help me edit patches so that they will get accepted into Mercurial or Gnu patch. The mercurial wiki has a topic HandlingRejects which shows how simple it is…
Warren P
  • 65,725
  • 40
  • 181
  • 316
1
vote
1 answer

Mercurial + MQ EOL behaviour

I'm working with mercurial+mq, on Win+OSX, and the EOL issues are killing me. I've activated EOL extension, added .hgeol as shown below: [patterns] **.sln = CRLF **.vcproj = CRLF **.vcxproj = CRLF **.vcproj.filters = CRLF **.vcxproj.filters =…
Virgil
  • 3,022
  • 2
  • 19
  • 36
1
vote
0 answers

How can I check existing patches into a Mercurial queue repository

I have an existing queue directory with a number patches already in it. I am about to fold them into a single commit but I would like to preserve the original patches before I do that. How can I do that? This is what I tried so far: $ hg ci…
Stephen Rasku
  • 2,554
  • 7
  • 29
  • 51
1 2 3
4
5 6 7