##// END OF EJS Templates
bookmark: informs of failure to upgrade a bookmark...
Pierre-Yves David -
r25564:847fce27 default
parent child Browse files
Show More
@@ -401,6 +401,11 b' def updatefromremote(ui, repo, remotemar'
401 if scid in repo: # add remote bookmarks for changes we already have
401 if scid in repo: # add remote bookmarks for changes we already have
402 changed.append((b, bin(scid), status,
402 changed.append((b, bin(scid), status,
403 _("adding remote bookmark %s\n") % (b)))
403 _("adding remote bookmark %s\n") % (b)))
404 elif b in explicit:
405 explicit.remove(b)
406 ui.warn(_("remote bookmark %s points to locally missing %s\n")
407 % (b, scid[:12]))
408
404 for b, scid, dcid in advsrc:
409 for b, scid, dcid in advsrc:
405 changed.append((b, bin(scid), status,
410 changed.append((b, bin(scid), status,
406 _("updating bookmark %s\n") % (b)))
411 _("updating bookmark %s\n") % (b)))
@@ -427,6 +432,11 b' def updatefromremote(ui, repo, remotemar'
427 explicit.discard(b)
432 explicit.discard(b)
428 changed.append((b, bin(scid), status,
433 changed.append((b, bin(scid), status,
429 _("importing bookmark %s\n") % (b)))
434 _("importing bookmark %s\n") % (b)))
435 for b, scid, dcid in differ:
436 if b in explicit:
437 explicit.remove(b)
438 ui.warn(_("remote bookmark %s points to locally missing %s\n")
439 % (b, scid[:12]))
430
440
431 if changed:
441 if changed:
432 tr = trfunc()
442 tr = trfunc()
General Comments 0
You need to be logged in to leave comments. Login now