➜

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 serhiy.storchaka
Recipients Matthew.Bentley, ezio.melotti, lemburg, loewis, nnorwitz, python-dev, serhiy.storchaka
Date 2013-06-13.07:16:01
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1371107762.02.0.543709061374.issue18048@psf.upfronthosting.co.za>
In-reply-to
Content 
Merging itself is trivial. The trick is how preserve the history of both files. Unfortunately this can't be represented in one mercurial patch. Three commits needed for this.
History
Date User Action Args
2013-06-13 07:16:02serhiy.storchakasetrecipients: + serhiy.storchaka, lemburg, loewis, nnorwitz, ezio.melotti, python-dev, Matthew.Bentley
2013-06-13 07:16:02serhiy.storchakasetmessageid: <1371107762.02.0.543709061374.issue18048@psf.upfronthosting.co.za>
2013-06-13 07:16:01serhiy.storchakalinkissue18048 messages
2013-06-13 07:16:01serhiy.storchakacreate