tracking upstream, what now?

[Neal Becker]

Benoit Boissinot wrote:

> On Sun, Aug 15, 2010 at 4:40 PM, Neal Becker <ndbecker2 at gmail.com> wrote:
>> I've been maintaining a repo, tracking upstream while keeping my own
>> patches on top.
>>
>> With each new release of upstream, I do
>>
>> untar
>> mv new_version new_version.dist
>> cp -al last_version.dist/.hg new_version.dist
>> hg addremove
>>
>> cp -al old_version.hg new_version.hg
>> hg pull new_version.dist
>> hg merge
>>
>> Now upstream has adopted some of my patches.  Now what?
>> I did merge OK.  I guess I don't _have_ to do anything.  But it would be
>> nice to eliminate those old dead patches.
> 
> It looks like a workflow where mq could be a good fit.
> (replacing the merge part with rebase --mq)
> 
> cheers,
> 
> Benoit
hg rebase --mq --help
hg rebase: option --mq not recognized