##// END OF EJS Templates
update: allow branch crossing without -c or -C, with no uncommitted changes...
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.

File last commit:

r8936:1de6e7e1 default
r9717:68a1b9d0 default
Show More
branches.tmpl
30 lines | 1011 B | application/x-cheetah | CheetahLexer
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 {header}
<title>{repo|escape}: Branches</title>
Sune Foldager
gitweb: add branches page
r8356 <link rel="alternate" type="application/atom+xml"
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 href="{url}atom-tags" title="Atom feed for {repo|escape}"/>
Sune Foldager
gitweb: add branches page
r8356 <link rel="alternate" type="application/rss+xml"
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 href="{url}rss-tags" title="RSS feed for {repo|escape}"/>
Sune Foldager
gitweb: add branches page
r8356 </head>
<body>
<div class="page_header">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
Sune Foldager
gitweb: add branches page
r8356 </div>
<div class="page_nav">
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
branches |
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
Sune Foldager
gitweb: add branches page
r8356 <br/>
</div>
<div class="title">&nbsp;</div>
<table cellspacing="0">
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 {entries%branchentry}
Sune Foldager
gitweb: add branches page
r8356 </table>
Dirkjan Ochtman
git: use newer template syntax everywhere
r8427 {footer}