# HG changeset patch # User Martin Geisler # Date 2009-07-25 23:46:02 # Node ID 1aeb22492b258419e08b71eee5db2dfb692dc865 # Parent 50ebe8845a1b308f39f2f7922fbead5c4234a1dc fetch: wrap docstrings at 70 characters diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -15,17 +15,18 @@ from mercurial.lock import release def fetch(ui, repo, source='default', **opts): '''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. + This finds all changes from the repository at the specified path + or URL and adds them to the local repository. - If the pulled changes add a new branch head, the head is automatically - merged, and the result of the merge is committed. Otherwise, the working - directory is updated to include the new changes. + If the pulled changes add a new branch head, the head is + automatically merged, and the result of the merge is committed. + Otherwise, the working directory is updated to include the new + changes. When a merge occurs, the newly pulled changes are assumed to be - "authoritative". The head of the new changes is used as the first parent, - with local changes as the second. To switch the merge order, use - --switch-parent. + "authoritative". The head of the new changes is used as the first + parent, with local changes as the second. To switch the merge + order, use --switch-parent. See 'hg help dates' for a list of formats valid for -d/--date. '''