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

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

av6 - - Load All Authors

File last commit:

r38204:273ce823 default


                r47570:c52c3c4c

default

Download file

             manifest.tmpl
        
                    24 lines
            
             | 944 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / manifest.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: files for changeset {node|short}</title>

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>

      <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>

      <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>

      <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>

      {archives%archiveentry}

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / files for changeset <a href="{url|urlescape}rev/{node|short}">{node|short}</a>: {path|escape}</h2>

      <table cellpadding="0" cellspacing="0">

      {ifeq(path, up, '', updirentry)}

      {dentries%direntry}

      {fentries%fileentry}

      </table>

      {footer}

	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

				{header}
				<title>{repo\|escape}: files for changeset {node\|short}</title>
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / files for changeset <a href="{url\|urlescape}rev/{node\|short}">{node\|short}</a>: {path\|escape}</h2>

				<table cellpadding="0" cellspacing="0">
				{ifeq(path, up, '', updirentry)}
				{dentries%direntry}
				{fentries%fileentry}
				</table>
				{footer}