Le jeudi 09 juin 2011 à 02:30 +0200, brian.curtin a écrit :

http://hg.python.org/cpython/rev/f1509fc75435 changeset: 70715:f1509fc75435 branch: 2.7 parent: 70661:6e7a98cfcfab user: Brian Curtin <brian@python.org> date: Wed Jun 08 19:29:53 2011 -0500 summary: Merge

FYI this commit has only one parent, it's not a merge. It should have a changelog describing the patch. ... whereas the following commit has two parents, it's a merge:

http://hg.python.org/cpython/rev/567f30527913 changeset: 70714:567f30527913 parent: 70712:964d0d65a2a9 parent: 70713:88e318166eaf user: Brian Curtin <brian@python.org> date: Wed Jun 08 18:43:57 2011 -0500 summary: Fix #11583. Changed os.path.isdir to use GetFileAttributes (...)

You can use "merge", "Merge 3.2", or other similir changelog. I prefer to use "(Merge 3.2)Fix #11583. Changed os.path._isdir ..." : copy/paste the changelog of the original commit with "(Merge 3.2) " prefix. Victor