upstream/mercurial-mirror Files · mercurial/templates/paper/error.tmpl

unamend: abort if commit was not created by `hg [un]amend`...

unamend: abort if commit was not created by `hg [un]amend` `hg unamend` can currently undo any kind of rewrite, as long as it has an obsmarker. However, that has quite unexpected results if you run it after e.g. `hg rebase` (expecting it to behave like a generic `hg undo` command), because it updates to the predecessor and leaves the old changes in the working copy. I think it's better to allow `hg unamend` only after `hg amend` (and after `hg unamend` because that's documented as being supported). Differential Revision: https://phab.mercurial-scm.org/D12390

Gregory Szorc - - Load All Authors

File last commit:

r32758:cba4461a default


                r49836:9120c0cd

stable

Download file

             error.tmpl
        
                    42 lines
            
             | 1005 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: error</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>

      </div>

      <ul>

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

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

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

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

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

      </ul>

      <ul>

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

      </ul>

      </div>

      <div class="main">

      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

      <h3>error</h3>

      {searchform}

      <div class="description">

      <p>

      An error occurred while processing your request:

      </p>

      <p>

      {error|escape}

      </p>

      </div>

      </div>

      </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}: error</title>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
				</div>
				<ul>
				<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
				<li><a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
				</ul>
				<ul>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<div class="main">

				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				<h3>error</h3>

				{searchform}

				<div class="description">
				<p>
				An error occurred while processing your request:
				</p>
				<p>
				{error\|escape}
				</p>
				</div>
				</div>
				</div>

				{footer}