Show More
@@ -15,18 +15,17 b' from mercurial.lock import release' | |||
|
15 | 15 | def fetch(ui, repo, source='default', **opts): |
|
16 | 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 | |
|
19 |
|
|
|
18 | This finds all changes from the repository at the specified path or URL | |
|
19 | and adds them to the local repository. | |
|
20 | 20 | |
|
21 | If the pulled changes add a new branch head, the head is | |
|
22 |
|
|
|
23 |
|
|
|
24 | changes. | |
|
21 | If the pulled changes add a new branch head, the head is automatically | |
|
22 | merged, and the result of the merge is committed. Otherwise, the working | |
|
23 | directory is updated to include the new changes. | |
|
25 | 24 | |
|
26 | 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 | |
|
28 |
|
|
|
29 |
|
|
|
26 | "authoritative". The head of the new changes is used as the first parent, | |
|
27 | with local changes as the second. To switch the merge order, use | |
|
28 | --switch-parent. | |
|
30 | 29 | |
|
31 | 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