Mercurial > hg
view templates/paper/tags.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 | 1de6e7e1bb9f |
children |
line wrap: on
line source
{header} <title>{repo|escape}: tags</title> <link rel="alternate" type="application/atom+xml" href="{url}atom-tags" title="Atom feed for {repo|escape}: tags" /> <link rel="alternate" type="application/rss+xml" href="{url}rss-tags" title="RSS feed for {repo|escape}: tags" /> </head> <body> <div class="container"> <div class="menu"> <div class="logo"> <a href="http://mercurial.selenic.com/"> <img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li> <li class="active">tags</li> <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> </ul> </div> <div class="main"> <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2> <h3>tags</h3> <form class="search" action="{url}log"> {sessionvars%hiddenformentry} <p><input name="rev" id="search1" type="text" size="30" /></p> <div id="hint">find changesets by author, revision, files, or words in the commit message</div> </form> <table class="bigtable"> <tr> <th>tag</th> <th>node</th> </tr> {entries%tagentry} </table> </div> </div> {footer}