equal
deleted
inserted
replaced
54 try: |
54 try: |
55 branchnode = repo.branchtip(branch) |
55 branchnode = repo.branchtip(branch) |
56 except error.RepoLookupError: |
56 except error.RepoLookupError: |
57 branchnode = None |
57 branchnode = None |
58 if parent != branchnode: |
58 if parent != branchnode: |
59 raise util.Abort(_('working dir not at branch tip ' |
59 raise util.Abort(_('working directory not at branch tip ' |
60 '(use "hg update" to check out branch tip)')) |
60 '(use "hg update" to check out branch tip)')) |
61 |
61 |
62 wlock = lock = None |
62 wlock = lock = None |
63 try: |
63 try: |
64 wlock = repo.wlock() |
64 wlock = repo.wlock() |