Show More
@@ -4961,6 +4961,14 b' def pull(ui, repo, source="default", **o' | |||||
4961 |
|
4961 | |||
4962 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
4962 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) | |
4963 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) |
|
4963 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) | |
|
4964 | # update specified bookmarks | |||
|
4965 | if opts.get('bookmark'): | |||
|
4966 | marks = repo._bookmarks | |||
|
4967 | for b in opts['bookmark']: | |||
|
4968 | # explicit pull overrides local bookmark if any | |||
|
4969 | ui.status(_("importing bookmark %s\n") % b) | |||
|
4970 | marks[b] = repo[remotebookmarks[b]].node() | |||
|
4971 | marks.write() | |||
4964 | if checkout: |
|
4972 | if checkout: | |
4965 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
4973 | checkout = str(repo.changelog.rev(other.lookup(checkout))) | |
4966 | repo._subtoppath = source |
|
4974 | repo._subtoppath = source | |
@@ -4970,14 +4978,6 b' def pull(ui, repo, source="default", **o' | |||||
4970 | finally: |
|
4978 | finally: | |
4971 | del repo._subtoppath |
|
4979 | del repo._subtoppath | |
4972 |
|
4980 | |||
4973 | # update specified bookmarks |
|
|||
4974 | if opts.get('bookmark'): |
|
|||
4975 | marks = repo._bookmarks |
|
|||
4976 | for b in opts['bookmark']: |
|
|||
4977 | # explicit pull overrides local bookmark if any |
|
|||
4978 | ui.status(_("importing bookmark %s\n") % b) |
|
|||
4979 | marks[b] = repo[remotebookmarks[b]].node() |
|
|||
4980 | marks.write() |
|
|||
4981 | finally: |
|
4981 | finally: | |
4982 | other.close() |
|
4982 | other.close() | |
4983 | return ret |
|
4983 | return ret |
@@ -907,8 +907,8 b' pull over ssh' | |||||
907 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
907 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
908 | 1 new obsolescence markers |
|
908 | 1 new obsolescence markers | |
909 | updating bookmark book_02de |
|
909 | updating bookmark book_02de | |
|
910 | importing bookmark book_02de | |||
910 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
911 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
911 | importing bookmark book_02de |
|
|||
912 | $ hg -R other debugobsolete |
|
912 | $ hg -R other debugobsolete | |
913 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
913 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
914 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
914 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
@@ -929,8 +929,8 b' pull over http' | |||||
929 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
929 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
930 | 1 new obsolescence markers |
|
930 | 1 new obsolescence markers | |
931 | updating bookmark book_42cc |
|
931 | updating bookmark book_42cc | |
|
932 | importing bookmark book_42cc | |||
932 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
933 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
933 | importing bookmark book_42cc |
|
|||
934 | $ cat main-error.log |
|
934 | $ cat main-error.log | |
935 | $ hg -R other debugobsolete |
|
935 | $ hg -R other debugobsolete | |
936 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
936 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now