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

merge: don't ignore conflicting file in remote renamed directory...

merge: don't ignore conflicting file in remote renamed directory When the remote side has renamed a directory from a/ to b/ and added a file b/c in it, and the local side has added a file a/c, we end up moving a/c to b/c without considering the remote version of b/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename ('dm') action.

Steven Brown - - Load All Authors

File last commit:

r21486:16352b34 default


                r23475:67f1d688

default

Download file

             changelogentry.tmpl
        
                    43 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / changelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
       <entry>

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to atom feed

              r21117
            
        <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty}</title>

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

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

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

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

              r9999
            
        <author>

         <name>{author|person|escape}</name>

         <email>{author|email|obfuscate}</email>

        </author>

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

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

        <content type="xhtml">

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
      	<table xmlns="http://www.w3.org/1999/xhtml">

      	<tr>

      		<th style="text-align:left;">changeset</th>

      		<td>{node|short}</td>

        Aaron Jensen
    
hgweb: adding branch names from inbranch template to atom feed

              r21117
            
                    </tr>

                    <tr>

                                    <th style="text-align:left;">branch</th>

                                    <td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>

                    </tr>

                    <tr>

                                    <th style="text-align:left;">bookmark</th>

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
      		<td>{bookmarks%"{name|escape}"}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;">tag</th>

      		<td>{tags%"{name|escape}"}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;">user</th>

      		<td>{author|obfuscate}</td>

      	</tr>

      	<tr>

      		<th style="text-align:left;vertical-align:top;">description</th>

        Steven Brown
    
hgweb: apply websub filter to the changeset description in rss and atom feeds...

              r21486
            
      		<td>{desc|strip|escape|websub|addbreaks|nonempty}</td>

        Aaron Jensen
    
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries

              r21056
            
      	</tr>

      	<tr>

      		<th style="text-align:left;vertical-align:top;">files</th>

      		<td>{files}</td>

      	</tr>

      	</table>

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

              r9999
            
        </content>

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<entry>
Aaron Jensen hgweb: adding branch names from inbranch template to atom feed	r21117	<title>{inbranch%"{if(name, '[{name\|escape}] ')}"}{branches%"{if(name, '[{name\|escape}] ')}"}{desc\|strip\|firstline\|strip\|escape\|nonempty}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<id>{urlbase}{url\|urlescape}#changeset-{node}</id>
		<link href="{urlbase}{url\|urlescape}rev/{node\|short}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<author>
		<name>{author\|person\|escape}</name>
		<email>{author\|email\|obfuscate}</email>
		</author>
		<updated>{date\|rfc3339date}</updated>
		<published>{date\|rfc3339date}</published>
		<content type="xhtml">
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	<table xmlns="http://www.w3.org/1999/xhtml">
		<tr>
		<th style="text-align:left;">changeset</th>
		<td>{node\|short}</td>
Aaron Jensen hgweb: adding branch names from inbranch template to atom feed	r21117	</tr>
		<tr>
		<th style="text-align:left;">branch</th>
		<td>{inbranch%"{name\|escape}"}{branches%"{name\|escape}"}</td>
		</tr>
		<tr>
		<th style="text-align:left;">bookmark</th>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	<td>{bookmarks%"{name\|escape}"}</td>
		</tr>
		<tr>
		<th style="text-align:left;">tag</th>
		<td>{tags%"{name\|escape}"}</td>
		</tr>
		<tr>
		<th style="text-align:left;">user</th>
		<td>{author\|obfuscate}</td>
		</tr>
		<tr>
		<th style="text-align:left;vertical-align:top;">description</th>
Steven Brown hgweb: apply websub filter to the changeset description in rss and atom feeds...	r21486	<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
Aaron Jensen hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries	r21056	</tr>
		<tr>
		<th style="text-align:left;vertical-align:top;">files</th>
		<td>{files}</td>
		</tr>
		</table>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</content>
		</entry>