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

mergestate: handle additional record types specially...

mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default


                r27027:a01ecbcf

default

Download file

             error.tmpl
        
                    17 lines
            
             | 484 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / error.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

       <!-- Error -->

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

              r18526
            
       <id>{urlbase}{url|urlescape}</id>

       <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>

       <link rel="alternate" href="{urlbase}{url|urlescape}"/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
       <title>Error</title>

       <updated>1970-01-01T00:00:00+00:00</updated>

       <entry>

        <title>Error</title>

        Matt Mackall
    
urls: bulk-change primary website URLs

              r26421
            
        <id>https://mercurial-scm.org/#error</id>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        <author>

          <name>mercurial</name>

        </author>

        <updated>1970-01-01T00:00:00+00:00</updated>

        <content type="text">{error|escape}</content>

       </entry>

      </feed>

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<!-- Error -->
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<id>{urlbase}{url\|urlescape}</id>
		<link rel="self" href="{urlbase}{url\|urlescape}atom-log"/>
		<link rel="alternate" href="{urlbase}{url\|urlescape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<title>Error</title>
		<updated>1970-01-01T00:00:00+00:00</updated>
		<entry>
		<title>Error</title>
Matt Mackall urls: bulk-change primary website URLs	r26421	<id>https://mercurial-scm.org/#error</id>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<author>
		<name>mercurial</name>
		</author>
		<updated>1970-01-01T00:00:00+00:00</updated>
		<content type="text">{error\|escape}</content>
		</entry>
		</feed>