Mercurial > hg-stable
changeset 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 | 5a4f220fbfca |
| children | 6252b4f1c4b4 |
| files | mercurial/bookmarks.py tests/test-bookmarks-pushpull.t |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
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:
--- a/tests/test-bookmarks-pushpull.t Wed Dec 12 02:38:14 2012 +0100 +++ b/tests/test-bookmarks-pushpull.t Tue Jan 15 02:59:12 2013 +0100 @@ -41,8 +41,8 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files + adding remote bookmark X updating bookmark Y - adding remote bookmark X adding remote bookmark Z (run 'hg update' to get a working copy) $ hg bookmarks @@ -145,9 +145,9 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) + divergent bookmark @ stored as @foo divergent bookmark X stored as X@foo updating bookmark Z - divergent bookmark @ stored as @foo (run 'hg heads' to see heads, 'hg merge' to merge) $ hg book @ 1:9b140be10808 @@ -324,10 +324,10 @@ pulling from http://localhost:$HGPORT/ no changes found divergent bookmark @ stored as @1 + divergent bookmark X stored as X@1 + adding remote bookmark Z adding remote bookmark foo adding remote bookmark foobar - divergent bookmark X stored as X@1 - adding remote bookmark Z importing bookmark Z $ hg clone http://localhost:$HGPORT/ cloned-bookmarks requesting all changes