upstream/mercurial-mirror Files · mercurial/templates/monoblue/changeset.tmpl

graft: don't drop the second parent on unsuccessful merge (issue3498)...

graft: don't drop the second parent on unsuccessful merge (issue3498) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.

Brodie Rao - - Load All Authors

File last commit:

r15375:fe9d36a6 stable


                r17045:52ea9ce5

stable

Download file

             changeset.tmpl
        
                    65 lines
            
             | 2.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / changeset.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

          <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files</h1>

              <form action="{url}log">

                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

                  <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>

                  <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>

                  <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>

                  <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>

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

                  <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

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

                  <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>

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

              </ul>

          </div>

          <ul class="submenu">

              <li class="current">changeset</li>

              <li><a href="{url}raw-rev/{node|short}">raw</a> {archives%archiveentry}</li>

          </ul>

          <h2 class="no-link no-border">changeset</h2>

          <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>

          <p class="changeset-age age">{date|rfc822date}</p>

          <dl class="overview">

              <dt>author</dt>

              <dd>{author|obfuscate}</dd>

              <dt>date</dt>

              <dd>{date|rfc822date}</dd>

              {branch%changesetbranch}

              <dt>changeset {rev}</dt>

              <dd>{node|short}</dd>

              {parent%changesetparent}

              {child%changesetchild}

          </dl>

          <p class="description">{desc|strip|escape|addbreaks|nonempty}</p>

          <table>

          {files}

          </table>

          <div class="diff">

          {diff}

          </div>

      {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}: changeset {rev}:{node\|short}</title>
				<link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>

				<body>
				<div id="container">
				<div class="page-header">
				<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / files</h1>

				<form action="{url}log">
				{sessionvars%hiddenformentry}
				<dl class="search">
				<dt><label>Search: </label></dt>
				<dd><input type="text" name="rev" /></dd>
				</dl>
				</form>

				<ul class="page-nav">
				<li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
				<li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
				<li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
				<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				<li><a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a></li>
				<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<ul class="submenu">
				<li class="current">changeset</li>
				<li><a href="{url}raw-rev/{node\|short}">raw</a> {archives%archiveentry}</li>
				</ul>

				<h2 class="no-link no-border">changeset</h2>

				<h3 class="changeset"><a href="{url}raw-rev/{node\|short}">{desc\|strip\|escape\|firstline\|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>
				<p class="changeset-age age">{date\|rfc822date}</p>

				<dl class="overview">
				<dt>author</dt>
				<dd>{author\|obfuscate}</dd>
				<dt>date</dt>
				<dd>{date\|rfc822date}</dd>
				{branch%changesetbranch}
				<dt>changeset {rev}</dt>
				<dd>{node\|short}</dd>
				{parent%changesetparent}
				{child%changesetchild}
				</dl>

				<p class="description">{desc\|strip\|escape\|addbreaks\|nonempty}</p>

				<table>
				{files}
				</table>

				<div class="diff">
				{diff}
				</div>

				{footer}