equal
deleted
inserted
replaced
1013 pullop.todosteps.remove('bookmarks') |
1013 pullop.todosteps.remove('bookmarks') |
1014 repo = pullop.repo |
1014 repo = pullop.repo |
1015 remotebookmarks = pullop.remotebookmarks |
1015 remotebookmarks = pullop.remotebookmarks |
1016 bookmod.updatefromremote(repo.ui, repo, remotebookmarks, |
1016 bookmod.updatefromremote(repo.ui, repo, remotebookmarks, |
1017 pullop.remote.url(), |
1017 pullop.remote.url(), |
|
1018 pullop.gettransaction, |
1018 explicit=pullop.explicitbookmarks) |
1019 explicit=pullop.explicitbookmarks) |
1019 |
1020 |
1020 def _pullobsolete(pullop): |
1021 def _pullobsolete(pullop): |
1021 """utility function to pull obsolete markers from a remote |
1022 """utility function to pull obsolete markers from a remote |
1022 |
1023 |