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

merge: refuse update/merge if there are unresolved conflicts (BC)...

merge: refuse update/merge if there are unresolved conflicts (BC) We currently allow updating and merging (with --force) when there are unresolved merge conflicts, as long as there is only one parent of the working copy. Even worse, when updating to another revision (linearly), if one of the unresolved files (including any conflict markers in the working copy) can now be merged cleanly with the target revision, the file becomes marked as resolved. While we could potentially allow updates that affect only files that are not in the set of unresolved files, that's considerably more work, and we don't have a use case for it anyway. Instead, let's keep it simple and refuse any merge or update (without -C) when there are unresolved conflicts. Note that test-merge-local.t explicitly checks for conflict markers that get carried over on update. It's unclear if that was intentional or not, but it seems bad enough that we should forbid it. The simplest way of fixing the test case is to leave the conflict markers in place and just mark the files resolved, so let's just do that for now.

Anton Shestakov - - Load All Authors

File last commit:

r24054:fdf7794b default


                r27316:777f668e

default

Download file

             tags.tmpl
        
                    57 lines
            
             | 1.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / tags.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags" />

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags" />

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl|urlescape}{logoimg}" 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 class="active">tags</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 class="atom-logo">

      <a href="{url|urlescape}atom-tags" title="subscribe to atom feed">

      <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />

      </a>

      </div>

      </div>

      <div class="main">

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

      <h3>tags</h3>

      <form class="search" action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

      <div id="hint">{searchhint}</div>

      </form>

      <table class="bigtable">

      <thead>

      <tr>

       <th>tag</th>

       <th>node</th>

      </tr>

      </thead>

      <tbody class="stripes2">

      {entries%tagentry}

      </tbody>

      </table>

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

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" 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 class="active">tags</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 class="atom-logo">
				<a href="{url\|urlescape}atom-tags" title="subscribe to atom feed">
				<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed" />
				</a>
				</div>
				</div>

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

				<form class="search" action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">{searchhint}</div>
				</form>

				<table class="bigtable">
				<thead>
				<tr>
				<th>tag</th>
				<th>node</th>
				</tr>
				</thead>
				<tbody class="stripes2">
				{entries%tagentry}
				</tbody>
				</table>
				</div>
				</div>

				{footer}