changeset 16719 | e7bf09acd410 |
parent 16669 | 766bbe587545 |
child 16743 | 38caf405d010 |
--- a/hgext/fetch.py Sun May 13 16:39:40 2012 +0200 +++ b/hgext/fetch.py Sun May 13 14:04:04 2012 +0200 @@ -38,7 +38,10 @@ parent, p2 = repo.dirstate.parents() branch = repo.dirstate.branch() - branchnode = repo.branchtags().get(branch) + try: + branchnode = repo.branchtip(branch) + except error.RepoLookupError: + branchnode = None if parent != branchnode: raise util.Abort(_('working dir not at branch tip ' '(use "hg update" to check out branch tip)'))