Mercurial > hg
view templates/template-vars.txt @ 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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | e0069e7fe419 |
children |
line wrap: on
line source
repo the name of the repo rev a changeset.manifest revision node a changeset node changesets total number of changesets file a filename filerev a file revision filerevs total number of file revisions up the directory of the relevant file path a path in the manifest, starting with "/" basename a short pathname date a date string age age in hours, days, etc line a line of text (escaped) desc a description (escaped, with breaks) shortdesc a short description (escaped) author a name or email addressv(obfuscated) parent a list of the parent child a list of the children tags a list of tag header the global page header footer the global page footer files a list of file links file_copies a list of pairs of name, source filenames dirs a set of directory links diff a diff of one or more files annotate an annotated file entries the entries relevant to the page Templates and commands: changelog(rev) - a page for browsing changesets naventry - a link for jumping to a changeset number filenodelink - jump to file diff fileellipses - printed after maxfiles changelogentry - an entry in the log manifest - browse a manifest as a directory tree