diff mercurial/hg.py @ 16276:6b16ded5c810 stable

bookmarks: clone non-divergent bookmarks with @ in them
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 21 Mar 2012 16:39:38 -0500
parents ed9f40bc346f
children 4d875bb546dc
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Mar 21 17:24:15 2012 +0900
+++ b/mercurial/hg.py	Wed Mar 21 16:39:38 2012 -0500
@@ -356,7 +356,7 @@
         if dircleanup:
             dircleanup.close()
 
-        # clone all bookmarks
+        # clone all bookmarks except divergent ones
         if destrepo.local() and srcrepo.capable("pushkey"):
             rb = srcrepo.listkeys('bookmarks')
             for k, n in rb.iteritems():