Mercurial > evolve

comparison tests/test-tutorial.t @ 900:98b5ac44a259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable into default
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 13 Apr 2014 16:46:13 -0400
parents 3ec90de03562 36c1c80e99a3
children 06100fbc05e5
comparison
equal deleted inserted replaced
899:4c305b8d4259 900:98b5ac44a259
442 $ hg help uncommit 442 $ hg help uncommit
443 hg uncommit [OPTION]... [NAME] 443 hg uncommit [OPTION]... [NAME]
444 444
445 move changes from parent revision to working directory 445 move changes from parent revision to working directory
446 446
447 Changes to selected files in parent revision appear again as uncommitted 447 Changes to selected files in the checked out revision appear again as
448 changed in the working directory. A new revision without selected changes 448 uncommitted changed in the working directory. A new revision without the
449 is created, becomes the new parent and obsoletes the previous one. 449 selected changes is created, becomes the checked out revision, and
450 obsoletes the previous one.
450 451
451 The --include option specifies patterns to uncommit. The --exclude option 452 The --include option specifies patterns to uncommit. The --exclude option
452 specifies patterns to keep in the commit. 453 specifies patterns to keep in the commit.
453 454
454 Return 0 if changed files are uncommitted. 455 Return 0 if changed files are uncommitted.
475 $ hg help fold 476 $ hg help fold
476 hg fold rev 477 hg fold rev
477 478
478 Fold multiple revisions into a single one 479 Fold multiple revisions into a single one
479 480
480 Revision from your current working directory to the specified one are fold 481 The revisions from your current working directory to the given one are
481 as a new one replacing the other 482 folded into a single successor revision.
482 483
483 you can alternatively use --rev to explicitly specify revision to be fold 484 you can alternatively use --rev to explicitly specify revisions to be
484 ignoring the current working directory parent. 485 folded, ignoring the current working directory parent.
485 486
486 options: 487 options:
487 488
488 -r --rev VALUE [+] explicitly specify the full set of revision to fold 489 -r --rev VALUE [+] explicitly specify the full set of revision to fold
489 490