##// 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:

r8431:5c1aabc5 default
r9717:68a1b9d0 default
Show More
filelogentry.tmpl
25 lines | 801 B | application/x-cheetah | CheetahLexer
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <table class="logEntry parity{parity}">
Matt Mackall
hgweb: move old style to spartan/
r7338 <tr>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <th class="age">{date|age} ago:</th>
<th class="firstline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
Matt Mackall
hgweb: move old style to spartan/
r7338 </tr>
<tr>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <th class="revision">revision {filerev}:</td>
Matt Mackall
hgweb: move old style to spartan/
r7338 <td class="node">
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(diff)</a>
<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(annotate)</a>
Matt Mackall
hgweb: move old style to spartan/
r7338 </td>
</tr>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 {rename%filelogrename}
Matt Mackall
hgweb: move old style to spartan/
r7338 <tr>
<th class="author">author:</th>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <td class="author">{author|obfuscate}</td>
Matt Mackall
hgweb: move old style to spartan/
r7338 </tr>
<tr>
<th class="date">date:</th>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <td class="date">{date|date}</td>
Matt Mackall
hgweb: move old style to spartan/
r7338 </tr>
</table>