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

context: don't count deleted files as candidates for path conflicts in IMM...

context: don't count deleted files as candidates for path conflicts in IMM This patch makes sure we don't consider the deleted files in our IMM wctx as potential conflicts while calculating paths conflicts. This fixes the bug demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D4543

av6 - - Load All Authors

File last commit:

r29437:6ab3465d default


                r39612:fa4d16da

default

Download file

             branchentry.tmpl
        
                    8 lines
            
             | 315 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / branchentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
       <entry>

        <title>{branch|escape}</title>

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

              r18526
            
        <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>

        <id>{urlbase}{url|urlescape}#branch-{node}</id>

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
        <updated>{date|rfc3339date}</updated>

        <published>{date|rfc3339date}</published>

        av6
    
hgweb: remove unnecessary CDATA markup in atom/branchentry.tmpl...

              r29437
            
        <content type="text">{branch|strip|escape}</content>

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
       </entry>

	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

Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	<entry>
		<title>{branch\|escape}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<link rel="alternate" href="{urlbase}{url\|urlescape}rev/{node\|short}"/>
		<id>{urlbase}{url\|urlescape}#branch-{node}</id>
Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	<updated>{date\|rfc3339date}</updated>
		<published>{date\|rfc3339date}</published>
av6 hgweb: remove unnecessary CDATA markup in atom/branchentry.tmpl...	r29437	<content type="text">{branch\|strip\|escape}</content>
Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	</entry>