mercurial/commands.py
changeset 8029 e0c434abd530
parent 8028 3aaca5901ade
child 8031 813a02a4eda2
equal deleted inserted replaced
8028:3aaca5901ade 8029:e0c434abd530
  2922     Update the repository's working directory to the specified
  2922     Update the repository's working directory to the specified
  2923     revision, or the tip of the current branch if none is specified.
  2923     revision, or the tip of the current branch if none is specified.
  2924     Use null as the revision to remove the working copy (like 'hg
  2924     Use null as the revision to remove the working copy (like 'hg
  2925     clone -U').
  2925     clone -U').
  2926 
  2926 
  2927     When the working directory contains no uncommitted changes, it will be
  2927     When the working directory contains no uncommitted changes, it
  2928     replaced by the state of the requested revision from the repository.
  2928     will be replaced by the state of the requested revision from the
  2929     When the requested revision is on a different branch, the working
  2929     repository. When the requested revision is on a different branch,
  2930     directory will additionally be switched to that branch.
  2930     the working directory will additionally be switched to that
       
  2931     branch.
  2931 
  2932 
  2932     When there are uncommitted changes, use option -C to discard them,
  2933     When there are uncommitted changes, use option -C to discard them,
  2933     forcibly replacing the state of the working directory with the requested
  2934     forcibly replacing the state of the working directory with the
  2934     revision.
  2935     requested revision.
  2935 
  2936 
  2936     When there are uncommitted changes and option -C is not used, and
  2937     When there are uncommitted changes and option -C is not used, and
  2937     the parent revision and requested revision are on the same branch,
  2938     the parent revision and requested revision are on the same branch,
  2938     and one of them is an ancestor of the other, then the new working
  2939     and one of them is an ancestor of the other, then the new working
  2939     directory will contain the requested revision merged with the
  2940     directory will contain the requested revision merged with the