Issue1099

Title don't allow pull with mq patches applied
Priority wish Status chatting
Superseder Nosy List astratto, dim, djc, jglick, nbecker, nriley, parren, pmezard
Assigned To Topics

Created on 2008-04-23.11:00:31 by nbecker, last changed 2011-07-18.17:35:20 by astratto.

Messages
msg6430 (view) Author: jglick Date: 2008-06-27.00:13:45
+1. The consequences of merging patches with real changesets accidentally are
sufficiently bad that I don't think Hg should let you do it casually.

MQ rebase is already opaque enough; I don't see it being any worse with the need
to specify --force in one step.

Current workaround for Unix users:

[hooks]
prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
msg6355 (view) Author: nriley Date: 2008-06-18.23:15:23
The usage message for qclone says "If source is remote, this command can not check if 
patches are applied in source."  But it is possible to interrogate a remote repo to 
figure out if MQ patches are applied, e.g. checking the output of "hg id -r qtip 
default" in the usual case.

So it seems a useful feature for both qclone and pull to refuse to pull MQ patches, 
with the option to override.
msg5958 (view) Author: parren Date: 2008-04-24.14:08:57
Maybe I misunderstood the OP. My comment applies to when the _source_
repo of the pull has mq patches applied. If we're talking about the
_target_ repo and forbidding update in it, then please make sure that
the mq rebase process still works (qsave, update, qpush -m).
msg5955 (view) Author: djc Date: 2008-04-24.09:18:36
Like pmezard says, I think it would be fine if pull was allowed, but update
should probably not be allowed. Not sure what that means for qclone.
msg5949 (view) Author: parren Date: 2008-04-23.18:08:11
This would likely break qclone. If so, then please don't. We should at
most disallow pulling the mq changesets, but not those before qbase.
msg5946 (view) Author: pmezard Date: 2008-04-23.11:23:37
pull --update may be disallowed, pull itself has no interaction with the working
directory so no direct influence of mq. What you want to avoid is updating to
some rev while you have MQ patches applied, or worse, merge with the queue.
msg5945 (view) Author: nbecker Date: 2008-04-23.11:00:27
Pull is allowed when mq patches are applied, but that seems to be a good way to 
make a mess of things.  Should be disallowed by default.  Maybe '--force' to 
overide?
History
Date User Action Args
2011-07-18 17:35:20astrattosetnosy: + astratto
2010-04-14 14:48:16dimsetnosy: + dim
2008-06-27 00:13:46jglicksetnosy: + jglick
messages: + msg6430
2008-06-18 23:15:23nrileysetnosy: + nriley
messages: + msg6355
2008-04-24 14:08:59parrensetnosy: pmezard, parren, nbecker, djc
messages: + msg5958
2008-04-24 09:18:36djcsetnosy: + djc
messages: + msg5955
2008-04-23 18:08:13parrensetnosy: + parren
messages: + msg5949
2008-04-23 11:23:38pmezardsetstatus: unread -> chatting
nosy: + pmezard
messages: + msg5946
2008-04-23 11:00:31nbeckercreate