##// END OF EJS Templates
Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

File last commit:

r4654:e0e73ba3 default
r5080:73fdc8bd default
Show More
test-dispatch.out
32 lines | 1017 B | text/plain | TextLexer
/ tests / test-dispatch.out
Brendan Cully
dispatch: restore a dropped shlex import...
r4563 adding a
Matt Mackall
dispatch: fix handling of incorrect number of arguments
r4621 # 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 repo 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
-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
Brendan Cully
dispatch: restore a dropped shlex import...
r4563 % [defaults]
a
a
Brendan Cully
Fix dispatch error message when not in a repo
r4654 % no repo
abort: There is no Mercurial repository here (.hg not found)!