[chirp_devel] help contributing...

[Jim Unroe]

On Wed, Dec 31, 2014 at 2:00 PM, Tom Hayward <tom at tomh.us> wrote:
> On Wed, Dec 31, 2014 at 10:54 AM, jml <jml at jmlzone.com> wrote:
>> Ok I may have HG screwed myself.
>>
>> In the past I would hg pull and hg merge before I pushed,  So
>> I hg pulled and hg merged and got several changes I did not have before.
>> I have tested my changes and they seem to work.
>
> Since you don't control the upstream repo, the easiest way to
> temporarily add and remove your commits during development is to use
> Mq. To pull upstream changes, first remove your patches, update, then
> add your patches back to the local repo:
> hg qpop --all
> hg pull -u
> hg qpush --all
>

Thanks Tom. I'm sure that this will be useful to me as well.

Jim