Mercurial > hg

comparison hgext/fetch.py @ 7991:675a5a1ab0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: word-wrap help texts at 70 characters
author Martin Geisler <mg@daimi.au.dk>
date Sat, 04 Apr 2009 23:17:21 +0200
parents 7b813bdbd5d0
children 6ee71f78497c
comparison
equal deleted inserted replaced
7990:cdb848e8c4b5 7991:675a5a1ab0ee
14 '''pull changes from a remote repository, merge new changes if needed. 14 '''pull changes from a remote repository, merge new changes if needed.
15 15
16 This finds all changes from the repository at the specified path 16 This finds all changes from the repository at the specified path
17 or URL and adds them to the local repository. 17 or URL and adds them to the local repository.
18 18
19 If the pulled changes add a new branch head, the head is automatically 19 If the pulled changes add a new branch head, the head is
20 merged, and the result of the merge is committed. Otherwise, the 20 automatically merged, and the result of the merge is committed.
21 working directory is updated to include the new changes. 21 Otherwise, the working directory is updated to include the new
22 changes.
22 23
23 When a merge occurs, the newly pulled changes are assumed to be 24 When a merge occurs, the newly pulled changes are assumed to be
24 "authoritative". The head of the new changes is used as the first 25 "authoritative". The head of the new changes is used as the first
25 parent, with local changes as the second. To switch the merge 26 parent, with local changes as the second. To switch the merge
26 order, use --switch-parent. 27 order, use --switch-parent.