diff mercurial/bookmarks.py @ 18363:c6e033a7dd38

bookmarks: process pulled remote bookmarks in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents 20459152c7ac
children 2096e025a728
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Wed Dec 12 02:38:14 2012 +0100
+++ b/mercurial/bookmarks.py	Tue Jan 15 02:59:12 2013 +0100
@@ -198,7 +198,7 @@
     rb = remote.listkeys('bookmarks')
     changed = False
     localmarks = repo._bookmarks
-    for k in rb.keys():
+    for k in sorted(rb):
         if k in localmarks:
             nr, nl = rb[k], localmarks[k]
             if nr in repo: