view tests/test-dispatch.out @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

adding a
# missing arg
hg cat: invalid arguments
hg cat [OPTION]... FILE...

output the current or given revision of files

    Print the specified files as they were at the given revision. If no
    revision is given, the parent of the working directory is used, or tip if
    no revision is checked out.

    Output may be to a file, in which case the name of the file is given using
    a format string. The formatting rules are the same as for the export
    command, with the following additions:

      %s   basename of file being printed
      %d   dirname of file being printed, or '.' if in repository root
      %p   root-relative path name of file being printed

options:

 -o --output   print output to file with formatted name
 -r --rev      print the given revision
    --decode   apply any matching decode filter
 -I --include  include names matching the given patterns
 -X --exclude  exclude names matching the given patterns

use "hg -v help cat" to show global options
% [defaults]
a
a: No such file in rev 000000000000
% no repo
abort: There is no Mercurial repository here (.hg not found)!