Show More
@@ -609,7 +609,10 b' def update(repo, node, branchmerge, forc' | |||||
609 | try: |
|
609 | try: | |
610 | node = repo.branchtags()[wc.branch()] |
|
610 | node = repo.branchtags()[wc.branch()] | |
611 | except KeyError: |
|
611 | except KeyError: | |
612 | raise util.Abort(_("branch %s not found") % wc.branch()) |
|
612 | if wc.branch() == "default": # no default branch! | |
|
613 | node = repo.lookup("tip") # update to tip | |||
|
614 | else: | |||
|
615 | raise util.Abort(_("branch %s not found") % wc.branch()) | |||
613 | overwrite = force and not branchmerge |
|
616 | overwrite = force and not branchmerge | |
614 | forcemerge = force and branchmerge |
|
617 | forcemerge = force and branchmerge | |
615 | pl = wc.parents() |
|
618 | pl = wc.parents() |
General Comments 0
You need to be logged in to leave comments.
Login now