Show More
@@ -1458,9 +1458,12 b' def clone(ui, source, dest=None, **opts)' | |||||
1458 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1458 | identifiers with -r/--rev or branches with -b/--branch. The | |
1459 | resulting clone will contain only the specified changesets and |
|
1459 | resulting clone will contain only the specified changesets and | |
1460 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1460 | their ancestors. These options (or 'clone src#rev dest') imply | |
1461 |
--pull, even for local source repositories. |
|
1461 | --pull, even for local source repositories. | |
1462 | tag will include the tagged changeset but not the changeset |
|
1462 | ||
1463 | containing the tag. |
|
1463 | .. note:: | |
|
1464 | ||||
|
1465 | Specifying a tag will include the tagged changeset but not the | |||
|
1466 | changeset containing the tag. | |||
1464 |
|
1467 | |||
1465 | If the source repository has a bookmark called '@' set, that |
|
1468 | If the source repository has a bookmark called '@' set, that | |
1466 | revision will be checked out in the new repository by default. |
|
1469 | revision will be checked out in the new repository by default. | |
@@ -5357,10 +5360,13 b' def paths(ui, repo, search=None):' | |||||
5357 | When ``default-push`` is set, it will be used for push and |
|
5360 | When ``default-push`` is set, it will be used for push and | |
5358 | ``default`` will be used for pull; otherwise ``default`` is used |
|
5361 | ``default`` will be used for pull; otherwise ``default`` is used | |
5359 | as the fallback for both. When cloning a repository, the clone |
|
5362 | as the fallback for both. When cloning a repository, the clone | |
5360 |
source is written as ``default`` in ``.hg/hgrc``. |
|
5363 | source is written as ``default`` in ``.hg/hgrc``. | |
5361 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
5364 | ||
5362 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
5365 | .. note:: | |
5363 | :hg:`bundle`) operations. |
|
5366 | ||
|
5367 | ``default`` and ``default-push`` apply to all inbound (e.g. | |||
|
5368 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` | |||
|
5369 | and :hg:`bundle`) operations. | |||
5364 |
|
5370 | |||
5365 | See :hg:`help urls` for more information. |
|
5371 | See :hg:`help urls` for more information. | |
5366 |
|
5372 | |||
@@ -5833,9 +5839,11 b' def resolve(ui, repo, *pats, **opts):' | |||||
5833 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
5839 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
5834 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
5840 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
5835 |
|
5841 | |||
5836 | Note that Mercurial will not let you commit files with unresolved |
|
5842 | .. note:: | |
5837 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
5843 | ||
5838 | commit after a conflicting merge. |
|
5844 | Mercurial will not let you commit files with unresolved merge | |
|
5845 | conflicts. You must use :hg:`resolve -m ...` before you can | |||
|
5846 | commit after a conflicting merge. | |||
5839 |
|
5847 | |||
5840 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
5848 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
5841 | """ |
|
5849 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now