convert: report cvsps branchpoints sorted

hgext/convert/cvsps.py

@@ -827,7 +827,8 def debugcvsps(ui, *args, **opts):
             ui.write(('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
                                   ','.join(cs.tags) or '(none)')))
             if cs.branchpoints:
-                ui.write(('Branchpoints: %s \n') % ', '.join(cs.branchpoints))
+                ui.write(('Branchpoints: %s \n') %
+                         ', '.join(sorted(cs.branchpoints)))
             if opts["parents"] and cs.parents:
                 if len(cs.parents) > 1:
                     ui.write(('Parents: %s\n' %

tests/test-convert-cvsnt-mergepoints.t

@@ -116,7 +116,7 return to trunk and merge MYBRANCH1_2
   Author: user
   Branch: HEAD
   Tag: (none) 
-  Branchpoints: MYBRANCH1_1, MYBRANCH1 
+  Branchpoints: MYBRANCH1, MYBRANCH1_1 
   Log:
   foo.txt