Mercurial > hg > mercurial-crew-with-dirclash
view templates/template-vars.txt @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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