Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 27490:fe376159a58d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: split notes into note containers
author timeless <timeless@mozdev.org>
date Tue, 22 Dec 2015 06:03:00 +0000
parents 51aff98d2861
children 9dcd55a63f0b
comparison
equal deleted inserted replaced
27489:51aff98d2861 27490:fe376159a58d
1456 1456
1457 To pull only a subset of changesets, specify one or more revisions 1457 To pull only a subset of changesets, specify one or more revisions
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. Note that specifying a 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.
1467 1470
1468 To check out a particular version, use -u/--update, or 1471 To check out a particular version, use -u/--update, or
5355 meaning. When performing a push or pull operation, they are used 5358 meaning. When performing a push or pull operation, they are used
5356 as fallbacks if no location is specified on the command-line. 5359 as fallbacks if no location is specified on the command-line.
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``. Note that 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
5367 Returns 0 on success. 5373 Returns 0 on success.
5368 """ 5374 """
5831 default is to mark all resolved files. 5837 default is to mark all resolved files.
5832 5838
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 """
5842 5850
5843 all, mark, unmark, show, nostatus = \ 5851 all, mark, unmark, show, nostatus = \