##// 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
shortlogentry.tmpl
7 lines | 264 B | application/x-cheetah | CheetahLexer
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <table class="slogEntry parity{parity}">
Matt Mackall
hgweb: move old style to spartan/
r7338 <tr>
Dirkjan Ochtman
spartan: use newer template syntax everywhere
r8431 <td class="age">{date|age}</td>
<td class="author">{author|person}</td>
<td class="node"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
Matt Mackall
hgweb: move old style to spartan/
r7338 </tr>
</table>