Le 11/05/2011 20:08, Victor Stinner a écrit : >>> (Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional >> “(Merge 3.1)” is inaccurate for 2.7. > Ah, why? I did not use "hg merge" command (but hg export|hg import), but > it's a "merge" between two branches. Which term would you use?
I prefer to use merge only to refer to hg merges. The 2.7 and 3.x lines are independent, so I wouldn’t put any marker in the commit message, just use the same as the message used in 3.1. Regards _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
