upstream/mercurial-mirror Files · mercurial/templates/spartan/changelogentry.tmpl

merge: also allow 'e' action with experimental.updatecheck=noconflict...

merge: also allow 'e' action with experimental.updatecheck=noconflict With experimental.updatecheck=noconflict set, if one checks out (tests: add execute bit and fix shbang line, 2015-12-22) and then try to check out its parent, hg will complain about conflicting changes, even though the working directory is clean. We need to also allow the 'e' action in merge.py. The 'e' action is used when moving to a commit where the only change to the file is to its executable flag, so it's just an optimized 'g' action. Doesn't seem to be worth writing a test for, since the existing setup in test-update-branches.t does not set any flags.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r21124:a6571421 default


                r31475:1b9b00ac

default

Download file

             changelogentry.tmpl
        
                    25 lines
            
             | 760 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <table class="logEntry parity{parity}">

       <tr>

        <th class="label"><span class="age">{date|rfc822date}</span>:</th>

        <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>

       </tr>

       <tr>

        <th class="revision">changeset {rev}:</th>

        <td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

       </tr>

       {parent%changelogparent}

       {child%changelogchild}

       {changelogtag}

       <tr>

        <th class="author">author:</th>

        <td class="author">{author|obfuscate}</td>

       </tr>

       <tr>

        <th class="date">date:</th>

        <td class="date">{date|rfc822date}</td>

       </tr>

       <tr>

        <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>

        <td class="files">{files}</td>

       </tr>

      </table>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				<table class="logEntry parity{parity}">
				<tr>
				<th class="label"><span class="age">{date\|rfc822date}</span>:</th>
				<th class="firstline">{desc\|strip\|firstline\|escape\|nonempty}</th>
				</tr>
				<tr>
				<th class="revision">changeset {rev}:</th>
				<td class="node"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%changelogparent}
				{child%changelogchild}
				{changelogtag}
				<tr>
				<th class="author">author:</th>
				<td class="author">{author\|obfuscate}</td>
				</tr>
				<tr>
				<th class="date">date:</th>
				<td class="date">{date\|rfc822date}</td>
				</tr>
				<tr>
				<th class="files"><a href="{url\|urlescape}file/{node\|short}{sessionvars%urlparameter}">files</a>:</th>
				<td class="files">{files}</td>
				</tr>
				</table>