Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 7983:7b813bdbd5d0
Change double spaces to single spaces in help texts.
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Sat, 04 Apr 2009 21:09:43 +0200 |
parents | cab4a521a3fd |
children | d5b1b846f277 |
comparison
equal
deleted
inserted
replaced
7982:cab4a521a3fd | 7983:7b813bdbd5d0 |
---|---|
589 In some cases, you can clone repositories and checked out files | 589 In some cases, you can clone repositories and checked out files |
590 using full hardlinks with | 590 using full hardlinks with |
591 | 591 |
592 $ cp -al REPO REPOCLONE | 592 $ cp -al REPO REPOCLONE |
593 | 593 |
594 This is the fastest way to clone, but it is not always safe. The | 594 This is the fastest way to clone, but it is not always safe. The |
595 operation is not atomic (making sure REPO is not modified during | 595 operation is not atomic (making sure REPO is not modified during |
596 the operation is up to you) and you have to make sure your editor | 596 the operation is up to you) and you have to make sure your editor |
597 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, | 597 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, |
598 this is not compatible with certain extensions that place their | 598 this is not compatible with certain extensions that place their |
599 metadata under the .hg directory, such as mq. | 599 metadata under the .hg directory, such as mq. |
600 | 600 |
601 """ | 601 """ |
602 cmdutil.setremoteconfig(ui, opts) | 602 cmdutil.setremoteconfig(ui, opts) |
607 update=not opts.get('noupdate')) | 607 update=not opts.get('noupdate')) |
608 | 608 |
609 def commit(ui, repo, *pats, **opts): | 609 def commit(ui, repo, *pats, **opts): |
610 """commit the specified files or all outstanding changes | 610 """commit the specified files or all outstanding changes |
611 | 611 |
612 Commit changes to the given files into the repository. Unlike a | 612 Commit changes to the given files into the repository. Unlike a |
613 centralized RCS, this operation is a local operation. See hg push | 613 centralized RCS, this operation is a local operation. See hg push |
614 for means to actively distribute your changes. | 614 for means to actively distribute your changes. |
615 | 615 |
616 If a list of files is omitted, all changes reported by "hg status" | 616 If a list of files is omitted, all changes reported by "hg status" |
617 will be committed. | 617 will be committed. |
618 | 618 |
2913 Update the repository's working directory to the specified revision, | 2913 Update the repository's working directory to the specified revision, |
2914 or the tip of the current branch if none is specified. Use null as | 2914 or the tip of the current branch if none is specified. Use null as |
2915 the revision to remove the working copy (like 'hg clone -U'). | 2915 the revision to remove the working copy (like 'hg clone -U'). |
2916 | 2916 |
2917 When the working dir contains no uncommitted changes, it will be | 2917 When the working dir contains no uncommitted changes, it will be |
2918 replaced by the state of the requested revision from the repo. When | 2918 replaced by the state of the requested revision from the repo. When |
2919 the requested revision is on a different branch, the working dir | 2919 the requested revision is on a different branch, the working dir |
2920 will additionally be switched to that branch. | 2920 will additionally be switched to that branch. |
2921 | 2921 |
2922 When there are uncommitted changes, use option -C to discard them, | 2922 When there are uncommitted changes, use option -C to discard them, |
2923 forcibly replacing the state of the working dir with the requested | 2923 forcibly replacing the state of the working dir with the requested |
2925 | 2925 |
2926 When there are uncommitted changes and option -C is not used, and | 2926 When there are uncommitted changes and option -C is not used, and |
2927 the parent revision and requested revision are on the same branch, | 2927 the parent revision and requested revision are on the same branch, |
2928 and one of them is an ancestor of the other, then the new working | 2928 and one of them is an ancestor of the other, then the new working |
2929 directory will contain the requested revision merged with the | 2929 directory will contain the requested revision merged with the |
2930 uncommitted changes. Otherwise, the update will fail with a | 2930 uncommitted changes. Otherwise, the update will fail with a |
2931 suggestion to use 'merge' or 'update -C' instead. | 2931 suggestion to use 'merge' or 'update -C' instead. |
2932 | 2932 |
2933 If you want to update just one file to an older revision, use revert. | 2933 If you want to update just one file to an older revision, use revert. |
2934 | 2934 |
2935 See 'hg help dates' for a list of formats valid for --date. | 2935 See 'hg help dates' for a list of formats valid for --date. |