On Wed, Dec 31, 2014 at 10:54 AM, jml jml@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
I tried hg export tip > add_comment.patch and I see everyones changes but mine.
if I hg diff -r2310 -r2311 | more then I see my changes.
Then try: hg export -r 2310:2311 > add_comment.patch or hg email -r 2310:2311
Tom KD7LXL