On Monday, March 31, 2014 3:15:52 PM UTC-5, Christian Brabandt wrote: > On So, 30 Mär 2014, Ben Fritz wrote: > > I disagree that "It is dangerous to pull changes from the central > > vim repository, while there are still patches applied." Pulling with patches > > applied always works just fine, the mq patches act just like real Mecurial > > changesets. What you don't want to do, is update after a pull with the > > patches still applied, because then you need to back up to a different > > changeset to unapply the patches. But even update isn't "dangerous". What > > would be bad is trying to merge the upstream changes into your mq patches > > using Mercurial merge commands. > > Yes, that's what I meant. So, to how about this: > > It is dangerous to pull changes from the central vim repository and > update your working copy at the same time (-u flag), while there are > still patches applied. Instead, make sure to pop all patches, update the > repository and push your patches again: >
That works, though as update may work it might be confusing to get the mq changesets moved around afterwards. I like it. > > Finally, it is OK to use mq in a repository others can pull from, if you use > > the relatively new "phases" feature to hide your mq changesets from anybody > > doing a "pull". You do this by enabling the "secret" option in mq, to make > > any changesets created by the extension hidden from others on pull or push: > > > > http://mercurial.selenic.com/wiki/MqExtension#Ensure_patch_queue_changesets_use_secret_Phase > > I saw this on that webpage. But I didn't want to confuse by introducing > yet another option of which I don't if it is available at all clients. > So how about this: > > Don't use MQ in a repository anyone might pull from (unless you hide > your mq changesets away using the <a > href='http://mercurial.selenic.com/wiki/MqExtension#Ensure_patch_queue_changesets_use_secret_Phase'>secret > > phase</a>) > I like this phrasing. Noting it's possible but not a good idea by default until you take other action. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
