Will Fiveash wrote: > I saw that a mutt-1.5.23 stable branch was created (thanks) which has me > wanting to update my local hg repo. Note that I've got several of my > own mutt patches I'm maintaining locally via the mq patch extension. Is > using: > > $ hg pull --rebase > > the right way to update my local mutt hg repo and rebase my local mq > patches (leaving them as mq patches)? If so, do I need to "hg qpush -a" > all my patches before doing the "hg pull --rebase"?
Hi Will, I use mq to maintain my local patches too. I have always thought mq was an alternative to having to rebase local changes. I always: hg qpop -a; hg pull -u; hq qpush -a to do a "rebase". Looking at http://mercurial.selenic.com/wiki/RebaseExtension, there is a note about its interaction with mq. It claims it will qfinish and qimport any applied mq patches as part of the rebase. I haven't tried it, but that doesn't sound like it will leave those patches as mq patches when it's done. -Kevin
signature.asc
Description: PGP signature
