equal
deleted
inserted
replaced
219 n = '%s@%s' % (k, p) |
219 n = '%s@%s' % (k, p) |
220 |
220 |
221 repo._bookmarks[n] = cr.node() |
221 repo._bookmarks[n] = cr.node() |
222 changed = True |
222 changed = True |
223 ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n)) |
223 ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n)) |
|
224 elif rb[k] in repo: |
|
225 # add remote bookmarks for changes we already have |
|
226 repo._bookmarks[k] = repo[rb[k]].node() |
|
227 changed = True |
|
228 ui.status(_("adding remote bookmark %s\n") % k) |
224 |
229 |
225 if changed: |
230 if changed: |
226 write(repo) |
231 write(repo) |
227 |
232 |
228 def diff(ui, repo, remote): |
233 def diff(ui, repo, remote): |