Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 17704:3d1a781b23c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Oct 2012 10:11:17 +0200
parents fdd0fc046cf1 4a07d2ff7c66
children e6067bec18da
comparison
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: