# HG changeset patch # User Martin Geisler # Date 1247003682 -7200 # Node ID 2555120b88f5084981fc8d945280a0b1565efc9d # Parent 269764ecffe2b3c7cd5e0d73e0dbe3e06ac9f06f fetch: wrapped docstrings at 78 characters diff -r 269764ecffe2 -r 2555120b88f5 hgext/fetch.py --- a/hgext/fetch.py Tue Jul 07 23:54:42 2009 +0200 +++ b/hgext/fetch.py Tue Jul 07 23:54:42 2009 +0200 @@ -15,18 +15,17 @@ 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. '''