[chirp_devel] chirp_devel Digest, Vol 88, Issue 11

Klaus Ruebsam
Sat Sep 1 07:26:47 PDT 2018


>> ... When you send the updated patch, please try to make it referenced 
>> to current tip. The latest patch you've sent is a diff on top of what 
>> you sent before. To keep the history clean, it would be better if you 
>> can send one patch that is a diff of the current state of the repo. 
>> If you're using mq and already have two patches now, you can use "hg 
>> qfold" to squash them into one.
>>
>>
Tried to do as requested, but hg (hg qfold 20180829 20180831) refused with:

"Abbruch: qfold kann den bereits angewandten Patch 20180829 nicht 
zusammenlegen"

Cancelled: qfold may not combine the already applied patch 201829

Should I start from sratch and reinstall the complete development 
environment and then sent in the current version of the complete file as 
a new patch with reference to #6063 once more?

Sorry for causing that much trouble. I just want to finally get it into 
the official release.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://intrepid.danplanet.com/pipermail/chirp_devel/attachments/20180901/9df67439/attachment-0001.html 


More information about the chirp_devel mailing list