Mercurial > hg
view templates/template-vars.txt @ 415:c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
If an "hg update" is attempted across branches, it is aborted with an
error message, basically saying that "update -m" is required. Don't
prompt the user for "keep vs delete" kinds of questions before deciding
to abort.
manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE
RF5czx2UQ2pSIP119xzq9mQ=
=Akj6
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:14:11 -0800 |
parents | c77a679e9cfa |
children | f8d44a2e6928 |
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 filenode a file node 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 manifest a manifest node manifestrev a manifest revision 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) p1, p2 parent nodes p1rev, p2rev parent revs header the global page header footer the global page footer files a list of file links 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