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

             filelogentry.tmpl
        
                    7 lines
            
             | 314 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / filelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <item>

          <title>{desc|strip|firstline|strip|escape}</title>

          <link>{urlbase}{url|urlescape}log{node|short}/{file|urlescape}</link>

          <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>

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

          <pubDate>{date|rfc822date}</pubDate>

      </item>

	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

				<item>
				<title>{desc\|strip\|firstline\|strip\|escape}</title>
				<link>{urlbase}{url\|urlescape}log{node\|short}/{file\|urlescape}</link>
				<description><![CDATA[{desc\|strip\|escape\|websub\|addbreaks\|nonempty}]]></description>
				<author>{author\|obfuscate}</author>
				<pubDate>{date\|rfc822date}</pubDate>
				</item>