➜

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 benjamin.peterson, erinspace, gregory.p.smith, martin.panter, python-dev, r.david.murray, serhiy.storchaka
Date 2016-06-03.04:56:48
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1464929808.12.0.3496304341.issue27185@psf.upfronthosting.co.za>
In-reply-to
Content 
This is even more complex, since you can't merge a revision with its parent.

A. Start at revision A.
B. Rename test_string to test_string_merged, giving revision B.
A. Update back to revision A.
C. Rename test_pep292 to test_string_merged, giving revision C.
D. Merge revisions B and C, and manually merge the contents of the two test_string_merged versions, giving revision D.
E. Rename test_string_merged to test_string, giving the final revision.
History
Date User Action Args
2016-06-03 04:56:48serhiy.storchakasetrecipients: + serhiy.storchaka, gregory.p.smith, benjamin.peterson, r.david.murray, python-dev, martin.panter, erinspace
2016-06-03 04:56:48serhiy.storchakasetmessageid: <1464929808.12.0.3496304341.issue27185@psf.upfronthosting.co.za>
2016-06-03 04:56:48serhiy.storchakalinkissue27185 messages
2016-06-03 04:56:48serhiy.storchakacreate