mercurial/hg.py
changeset 17704 3d1a781b23c0
parent 17671 fdd0fc046cf1
parent 17703 4a07d2ff7c66
child 17740 e6067bec18da
equal deleted inserted replaced
17702:57fe5aca86af 17704:3d1a781b23c0
   408                     except error.RepoLookupError:
   408                     except error.RepoLookupError:
   409                         continue
   409                         continue
   410                 bn = destrepo[uprev].branch()
   410                 bn = destrepo[uprev].branch()
   411                 destrepo.ui.status(_("updating to branch %s\n") % bn)
   411                 destrepo.ui.status(_("updating to branch %s\n") % bn)
   412                 _update(destrepo, uprev)
   412                 _update(destrepo, uprev)
       
   413                 if update in destrepo._bookmarks:
       
   414                     bookmarks.setcurrent(destrepo, update)
   413 
   415 
   414         return srcpeer, destpeer
   416         return srcpeer, destpeer
   415     finally:
   417     finally:
   416         release(srclock, destlock)
   418         release(srclock, destlock)
   417         if dircleanup is not None:
   419         if dircleanup is not None: