equal
deleted
inserted
replaced
19 nullid, |
19 nullid, |
20 nullrev, |
20 nullrev, |
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, |
27 util, |
28 util, |
28 worker, |
29 worker, |
992 pas = [None] |
993 pas = [None] |
993 if ancestor is not None: |
994 if ancestor is not None: |
994 pas = [repo[ancestor]] |
995 pas = [repo[ancestor]] |
995 |
996 |
996 if node is None: |
997 if node is None: |
997 nodes = list(repo.set('_updatedefaultdest()')) |
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 |
1003 p2 = repo[node] |
1002 p2 = repo[node] |
1004 if pas[0] is None: |
1003 if pas[0] is None: |