3

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 this behavior the default. Generally, I avoid setting defaults, since that would mean hg works differently on my machine than on other machines, but in this case it seems harmless.

hg help qpop says, for example

With --keep-changes, abort only if the uncommitted files overlap with
    patched files.
[...]
    --keep-changes tolerate non-conflicting local changes

So, can someone tell what to put in .hgrc so that --keep-changes is default for qpush and qpop?

See Bug 2780 - qpop should work if the local changes and the mq patches are unrelated for the history of this feature. It is possible there is no option to set this, in which case it is less useful. There isn't even a one letter alias.

user2864740
  • 60,010
  • 15
  • 145
  • 220
Faheem Mitha
  • 6,096
  • 7
  • 48
  • 83

2 Answers2

2

The defaults section of hgrc should do what you want (untested though):

[defaults]
qpush = --keep-changes
qpop  = --keep-changes

But.... defaults are "depreciated", and people are encouraged to use aliases instead. I don't think that will mean they disappear though, it would "break work-flows" which is a mortal sin in mercurial development.

Paul S
  • 7,645
  • 2
  • 24
  • 36
  • I think in this specific context, this default is Ok, because it is always what I want, at least I cannot think of a circumstance in which I would not want it to apply. Thanks. – Faheem Mitha Jan 03 '13 at 19:28
0

Read about alias section and pay special attention to note in this chapter

Note

It is possible to create aliases with the same names as existing commands, which will then override the original definitions. This is almost always a bad idea!

Lazy Badger
  • 94,711
  • 9
  • 78
  • 110
  • I know about aliases, and don't want to use that. I hoped there was some provision for a setting for `==keep-changes`. As I recall, there was some discussion about a setting at the time. Maybe it was never introduced? – Faheem Mitha Dec 03 '12 at 09:47