##// END OF EJS Templates
fetch: wrap docstrings at 70 characters
Martin Geisler -
r9258:1aeb2249 default
parent child Browse files
Show More
@@ -15,17 +15,18 from mercurial.lock import release
15 def fetch(ui, repo, source='default', **opts):
15 def fetch(ui, repo, source='default', **opts):
16 '''pull changes from a remote repository, merge new changes if needed.
16 '''pull changes from a remote repository, merge new changes if needed.
17
17
18 This finds all changes from the repository at the specified path or URL
18 This finds all changes from the repository at the specified path
19 and adds them to the local repository.
19 or URL and adds them to the local repository.
20
20
21 If the pulled changes add a new branch head, the head is automatically
21 If the pulled changes add a new branch head, the head is
22 merged, and the result of the merge is committed. Otherwise, the working
22 automatically merged, and the result of the merge is committed.
23 directory is updated to include the new changes.
23 Otherwise, the working directory is updated to include the new
24 changes.
24
25
25 When a merge occurs, the newly pulled changes are assumed to be
26 When a merge occurs, the newly pulled changes are assumed to be
26 "authoritative". The head of the new changes is used as the first parent,
27 "authoritative". The head of the new changes is used as the first
27 with local changes as the second. To switch the merge order, use
28 parent, with local changes as the second. To switch the merge
28 --switch-parent.
29 order, use --switch-parent.
29
30
30 See 'hg help dates' for a list of formats valid for -d/--date.
31 See 'hg help dates' for a list of formats valid for -d/--date.
31 '''
32 '''
General Comments 0
You need to be logged in to leave comments. Login now