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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r23475:67f1d688

default

Download file

             changelog.tmpl
        
                    10 lines
            
             | 282 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / changelog.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

       <!-- Changelog -->

        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>{repo|escape} Changelog</title>

       {latestentry%feedupdated}

      {entries%changelogentry}

      </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}
		<!-- Changelog -->
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>{repo\|escape} Changelog</title>
		{latestentry%feedupdated}

		{entries%changelogentry}
		</feed>