equal
deleted
inserted
replaced
1025 pas = [None] |
1025 pas = [None] |
1026 if ancestor is not None: |
1026 if ancestor is not None: |
1027 pas = [repo[ancestor]] |
1027 pas = [repo[ancestor]] |
1028 |
1028 |
1029 if node is None: |
1029 if node is None: |
1030 node = repo[destutil.destupdate(repo)].node() |
1030 rev, _mark, _act = destutil.destupdate(repo) |
|
1031 node = repo[rev].node() |
1031 |
1032 |
1032 overwrite = force and not branchmerge |
1033 overwrite = force and not branchmerge |
1033 |
1034 |
1034 p2 = repo[node] |
1035 p2 = repo[node] |
1035 if pas[0] is None: |
1036 if pas[0] is None: |