* On 14 Mar 2014, Will Fiveash wrote that a solaris dev wrote:
>
> You don't have to, but any patches you have that aren't applied and don't
> apply after the pull will have to be fixed "manually", just as if you did a
> qpop -a/pull -u/qpush cycle -- it won't benefit from any of the built-in
> merge assistance that you get with rebase.
I was trying to remember why I do the ritualistic qpop/pull/qpush dance
instead of rebase. That's probably it. I often have unapplied patches,
or even multiple series.
[alias]
qup = ! hg qpop -a && hg pull -u && hg qpush -a
qpr = ! hg qpush && hg qrefresh
So I run 'hg qup' to begin, and if an error is encountered during a
patch push, it breaks. Then I fix, qrefresh, and qpush -a again. ("hg
qpr" is just something related to this procedure that's sometimes
useful.)
--
David Champion • [email protected]
