Mercurial > hg-stable
changeset 9258:1aeb22492b25
fetch: wrap docstrings at 70 characters
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 26 Jul 2009 01:46:02 +0200 |
| parents | 50ebe8845a1b |
| children | 19a4b8fd5c48 |
| files | hgext/fetch.py |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Sun Jul 26 01:45:36 2009 +0200 +++ b/hgext/fetch.py Sun Jul 26 01:46:02 2009 +0200 @@ -15,17 +15,18 @@ 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. '''