Show More
@@ -21,6 +21,7 b' from .node import (' | |||||
21 | ) |
|
21 | ) | |
22 | from . import ( |
|
22 | from . import ( | |
23 | copies, |
|
23 | copies, | |
|
24 | destutil, | |||
24 | filemerge, |
|
25 | filemerge, | |
25 | obsolete, |
|
26 | obsolete, | |
26 | subrepo, |
|
27 | subrepo, | |
@@ -994,9 +995,7 b' def update(repo, node, branchmerge, forc' | |||||
994 | pas = [repo[ancestor]] |
|
995 | pas = [repo[ancestor]] | |
995 |
|
996 | |||
996 | if node is None: |
|
997 | if node is None: | |
997 |
node |
|
998 | node = repo[destutil.destupdate(repo)].node() | |
998 | if nodes: |
|
|||
999 | node = nodes[0].node() |
|
|||
1000 |
|
999 | |||
1001 | overwrite = force and not branchmerge |
|
1000 | overwrite = force and not branchmerge | |
1002 |
|
1001 |
General Comments 0
You need to be logged in to leave comments.
Login now