##// END OF EJS Templates
fetch: wrapped docstrings at 78 characters
Martin Geisler -
r9060:2555120b default
parent child Browse files
Show More
@@ -15,18 +15,17 b' 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
18 This finds all changes from the repository at the specified path or URL
19 or URL and adds them to the local repository.
19 and adds them to the local repository.
20
20
21 If the pulled changes add a new branch head, the head is
21 If the pulled changes add a new branch head, the head is automatically
22 automatically merged, and the result of the merge is committed.
22 merged, and the result of the merge is committed. Otherwise, the working
23 Otherwise, the working directory is updated to include the new
23 directory is updated to include the new changes.
24 changes.
25
24
26 When a merge occurs, the newly pulled changes are assumed to be
25 When a merge occurs, the newly pulled changes are assumed to be
27 "authoritative". The head of the new changes is used as the first
26 "authoritative". The head of the new changes is used as the first parent,
28 parent, with local changes as the second. To switch the merge
27 with local changes as the second. To switch the merge order, use
29 order, use --switch-parent.
28 --switch-parent.
30
29
31 See 'hg help dates' for a list of formats valid for -d/--date.
30 See 'hg help dates' for a list of formats valid for -d/--date.
32 '''
31 '''
General Comments 0
You need to be logged in to leave comments. Login now