changeset 7049 | 6489ee64b522 |
parent 7007 | a6b74fbb5ce0 |
child 7270 | 2db33c1a5654 |
--- a/hgext/fetch.py Mon Sep 22 14:47:21 2008 +0200 +++ b/hgext/fetch.py Wed Sep 24 13:22:11 2008 +0200 @@ -33,8 +33,9 @@ opts['date'] = util.parsedate(date) parent, p2 = repo.dirstate.parents() - branch = repo[parent].branch() - if parent != repo[branch].node(): + branch = repo.dirstate.branch() + branchnode = repo.branchtags().get(branch) + if parent != branchnode: raise util.Abort(_('working dir not at branch tip ' '(use "hg update" to check out branch tip)'))