# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358215154 -3600
# Node ID cfbd3302006624f1472aaa72dc643b05b6696e7c
# Parent  942ecb55b1de4bcdded55b4bdc9a50547fa916ba
convert: report cvsps branchpoints sorted

diff -r 942ecb55b1de -r cfbd33020066 hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py	Tue Jan 15 02:59:14 2013 +0100
+++ b/hgext/convert/cvsps.py	Tue Jan 15 02:59:14 2013 +0100
@@ -827,7 +827,8 @@
             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' %
diff -r 942ecb55b1de -r cfbd33020066 tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t	Tue Jan 15 02:59:14 2013 +0100
+++ b/tests/test-convert-cvsnt-mergepoints.t	Tue Jan 15 02:59:14 2013 +0100
@@ -116,7 +116,7 @@
   Author: user
   Branch: HEAD
   Tag: (none) 
-  Branchpoints: MYBRANCH1_1, MYBRANCH1 
+  Branchpoints: MYBRANCH1, MYBRANCH1_1 
   Log:
   foo.txt