Mercurial > hg
view templates/spartan/filelog.tmpl @ 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 | 5c1aabc58004 |
| children |
line wrap: on
line source
{header} <title>{repo|escape}: {file|escape} history</title> <link rel="alternate" type="application/atom+xml" href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}"> <link rel="alternate" type="application/rss+xml" href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}"> </head> <body> <div class="buttons"> <a href="{url}log{sessionvars%urlparameter}">changelog</a> <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> <a href="{url}graph{sessionvars%urlparameter}">graph</a> <a href="{url}tags{sessionvars%urlparameter}">tags</a> <a href="{url}branches{sessionvars%urlparameter}">branches</a> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> <a type="application/rss+xml" href="{url}rss-log/tip/{file|urlescape}">rss</a> <a type="application/atom+xml" href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">atom</a> </div> <h2>{file|escape} revision history</h2> <p>navigate: <small class="navigate">{nav%filenaventry}</small></p> {entries%filelogentry} {footer}