This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author r.david.murray
Recipients eric.araujo, ezio.melotti, fwierzbicki, r.david.murray, serhiy.storchaka, terry.reedy
Date 2013-01-12.01:49:33
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1357955375.7.0.54203410124.issue16886@psf.upfronthosting.co.za>
In-reply-to
Content
I'm not positive what Terry means by export patch and import patch...I think hg actually has commands like that, but I don't use them myself.  I just use hg diff to generate the diff/patch file, and then use the regular patch command to apply it to 2.7.  (I'm sure there are those who will laugh at me for being old school and not taking advantage of our nice shiny dvcs :)

I hear that graft is better at resolving conflicts, but as I say I haven't tried it yet.
History
Date User Action Args
2013-01-12 01:49:36r.david.murraysetrecipients: + r.david.murray, terry.reedy, fwierzbicki, ezio.melotti, eric.araujo, serhiy.storchaka
2013-01-12 01:49:35r.david.murraysetmessageid: <1357955375.7.0.54203410124.issue16886@psf.upfronthosting.co.za>
2013-01-12 01:49:35r.david.murraylinkissue16886 messages
2013-01-12 01:49:33r.david.murraycreate