and merge in one command (DEPRECATED)'''
+'''pull, update merge in one command'''
from mercurial.i18n import _
def sync(ui, repo, source='default', **opts):
- """pull changes from a remote repository, merge new changes if needed.
+ """pull changes from a remote repository, merge new changes if needed.
This finds all changes from the repository at the specified path
or URL and adds them to the local repository.
Otherwise, the working directory is updated to include the new
+ Finally a push is performed so that the local and remote are in sync.
When a merge is needed, the working directory is first updated to
the newly pulled changes. Local changes are then merged into the
pulled changes. To switch the merge order, use --switch-parent.
See :hg:`help dates` for a list of formats valid for -d/--date.