equal
deleted
inserted
replaced
1440 pas = [None] |
1440 pas = [None] |
1441 if ancestor is not None: |
1441 if ancestor is not None: |
1442 pas = [repo[ancestor]] |
1442 pas = [repo[ancestor]] |
1443 |
1443 |
1444 if node is None: |
1444 if node is None: |
1445 if (repo.ui.configbool('devel', 'all-warnings') |
1445 repo.ui.develwarn('update with no target', 'oldapi') |
1446 or repo.ui.configbool('devel', 'oldapi')): |
|
1447 repo.ui.develwarn('update with no target') |
|
1448 rev, _mark, _act = destutil.destupdate(repo) |
1446 rev, _mark, _act = destutil.destupdate(repo) |
1449 node = repo[rev].node() |
1447 node = repo[rev].node() |
1450 |
1448 |
1451 overwrite = force and not branchmerge |
1449 overwrite = force and not branchmerge |
1452 |
1450 |