Serhiy Storchaka added the comment: 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. ---------- resolution: fixed -> stage: resolved -> status: closed -> open _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue27185> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
