Mercurial > evolve

comparison tests/test-tutorial.t @ 891:36c1c80e99a3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: small language fixes in help
author Brendan Cully <brendan@kublai.com>
date Thu, 03 Apr 2014 23:36:23 -0700
parents 6a67606e1c34
children 98b5ac44a259 1ebe5c51919b
comparison
equal deleted inserted replaced
867:6a67606e1c34 891:36c1c80e99a3
434 $ hg help uncommit 434 $ hg help uncommit
435 hg uncommit [OPTION]... [NAME] 435 hg uncommit [OPTION]... [NAME]
436 436
437 move changes from parent revision to working directory 437 move changes from parent revision to working directory
438 438
439 Changes to selected files in parent revision appear again as uncommitted 439 Changes to selected files in the checked out revision appear again as
440 changed in the working directory. A new revision without selected changes 440 uncommitted changed in the working directory. A new revision without the
441 is created, becomes the new parent and obsoletes the previous one. 441 selected changes is created, becomes the checked out revision, and
442 obsoletes the previous one.
442 443
443 The --include option specifies patterns to uncommit. The --exclude option 444 The --include option specifies patterns to uncommit. The --exclude option
444 specifies patterns to keep in the commit. 445 specifies patterns to keep in the commit.
445 446
446 Return 0 if changed files are uncommitted. 447 Return 0 if changed files are uncommitted.
467 $ hg help fold 468 $ hg help fold
468 hg fold rev 469 hg fold rev
469 470
470 Fold multiple revisions into a single one 471 Fold multiple revisions into a single one
471 472
472 Revision from your current working directory to the specified one are fold 473 The revisions from your current working directory to the given one are
473 as a new one replacing the other 474 folded into a single successor revision.
474 475
475 you can alternatively use --rev to explicitly specify revision to be fold 476 you can alternatively use --rev to explicitly specify revisions to be
476 ignoring the current working directory parent. 477 folded, ignoring the current working directory parent.
477 478
478 options: 479 options:
479 480
480 -r --rev VALUE [+] explicitly specify the full set of revision to fold 481 -r --rev VALUE [+] explicitly specify the full set of revision to fold
481 482