Show More
@@ -91,16 +91,17 b' def _destupdatebranch(repo, clean, check' | |||
|
91 | 91 | """decide on an update destination from current branch""" |
|
92 | 92 | wc = repo[None] |
|
93 | 93 | movemark = node = None |
|
94 | currentbranch = wc.branch() | |
|
94 | 95 | try: |
|
95 | 96 | node = repo.revs('max(.::(head() and branch(%s)))' |
|
96 |
, |
|
|
97 | , currentbranch).first() | |
|
97 | 98 | if bookmarks.isactivewdirparent(repo): |
|
98 | 99 | movemark = repo['.'].node() |
|
99 | 100 | except error.RepoLookupError: |
|
100 |
if |
|
|
101 | if currentbranch == 'default': # no default branch! | |
|
101 | 102 | node = repo.lookup('tip') # update to tip |
|
102 | 103 | else: |
|
103 |
raise error.Abort(_("branch %s not found") % |
|
|
104 | raise error.Abort(_("branch %s not found") % currentbranch) | |
|
104 | 105 | return node, movemark, None |
|
105 | 106 | |
|
106 | 107 | # order in which each step should be evalutated |
General Comments 0
You need to be logged in to leave comments.
Login now