equal
deleted
inserted
replaced
1047 """Update the working directory to node. |
1047 """Update the working directory to node. |
1048 |
1048 |
1049 When overwrite is set, changes are clobbered, merged else |
1049 When overwrite is set, changes are clobbered, merged else |
1050 |
1050 |
1051 returns stats (see pydoc mercurial.merge.applyupdates)""" |
1051 returns stats (see pydoc mercurial.merge.applyupdates)""" |
|
1052 repo.ui.deprecwarn( |
|
1053 b'prefer merge.update() or merge.clean_update() over hg.updaterepo()', |
|
1054 b'5.7', |
|
1055 ) |
1052 return mergemod._update( |
1056 return mergemod._update( |
1053 repo, |
1057 repo, |
1054 node, |
1058 node, |
1055 branchmerge=False, |
1059 branchmerge=False, |
1056 force=overwrite, |
1060 force=overwrite, |