equal
deleted
inserted
replaced
5127 # The list of bookmark used here is not the one used to actually |
5127 # The list of bookmark used here is not the one used to actually |
5128 # update the bookmark name. This can result in the revision pulled |
5128 # update the bookmark name. This can result in the revision pulled |
5129 # not ending up with the name of the bookmark because of a race |
5129 # not ending up with the name of the bookmark because of a race |
5130 # condition on the server. (See issue 4689 for details) |
5130 # condition on the server. (See issue 4689 for details) |
5131 remotebookmarks = other.listkeys('bookmarks') |
5131 remotebookmarks = other.listkeys('bookmarks') |
|
5132 pullopargs['remotebookmarks'] = remotebookmarks |
5132 for b in opts['bookmark']: |
5133 for b in opts['bookmark']: |
5133 if b not in remotebookmarks: |
5134 if b not in remotebookmarks: |
5134 raise util.Abort(_('remote bookmark %s not found!') % b) |
5135 raise util.Abort(_('remote bookmark %s not found!') % b) |
5135 revs.append(remotebookmarks[b]) |
5136 revs.append(remotebookmarks[b]) |
5136 |
5137 |