upstream/mercurial-mirror Files · mercurial/templates/paper/bookmarks.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

             bookmarks.tmpl
        
                    57 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / bookmarks.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {header}

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

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </div>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <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>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <li class="active">bookmarks</li>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </ul>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </ul>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      <div class="atom-logo">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Anton Shestakov
    
hgweb: close <img> elements...

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

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      </a>

      </div>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <h3>bookmarks</h3>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {sessionvars%hiddenformentry}

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

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </form>

      <table class="bigtable">

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      <thead>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <tr>

       <th>bookmark</th>

       <th>node</th>

      </tr>

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      </thead>

        Alexander Plavin
    
hgweb: make stripes in bookmark list with CSS

              r19446
            
      <tbody class="stripes2">

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {entries%bookmarkentry}

        Alexander Plavin
    
hgweb: make stripes in bookmark list with CSS

              r19446
            
      </tbody>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </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

Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{header}
		<title>{repo\|escape}: bookmarks</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-bookmarks" title="Atom feed for {repo\|escape}: bookmarks" />
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-bookmarks" title="RSS feed for {repo\|escape}: bookmarks" />
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<li class="active">bookmarks</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</ul>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	<div class="atom-logo">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}atom-bookmarks" title="subscribe to atom feed">
Anton Shestakov hgweb: close <img> elements...	r23830	<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed" />
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	</a>
		</div>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<h3>bookmarks</h3>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form class="search" action="{url\|urlescape}log">
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</form>

		<table class="bigtable">
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	<thead>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<tr>
		<th>bookmark</th>
		<th>node</th>
		</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
Alexander Plavin hgweb: make stripes in bookmark list with CSS	r19446	<tbody class="stripes2">
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{entries%bookmarkentry}
Alexander Plavin hgweb: make stripes in bookmark list with CSS	r19446	</tbody>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</table>
		</div>
		</div>

		{footer}