upstream/mercurial-mirror Files · mercurial/templates/rss/filelogentry.tmpl

merge: add a config to allow conflict-free merge of changes on adjacent lines...

merge: add a config to allow conflict-free merge of changes on adjacent lines This change adds a config to make it no longer a conflict to merge changes made on adjacent lines. The reason these changes are considered a conflict is that there's no region of text at the relevant position (sync region) that's kept unchanged by both sides of the merge. The problem can be solved by making the sync regions being a bit more powerful: we can keep a 0-length sync region if we find that a block unchanged by one side is ajacent to a block unchanged by the other side. Since these 0-length sync regions are emitted using the ~same algorithm as the normal non-empty sync regions, this change involves no arbitrary decisions and I expect it to work pretty well. 0-length sync regions do create an ambiguity in a special case where two pairs of adjacent regions "meet" at the same point. This corresponds to an insertion made at the same place by the two sides of the merge, and this still results in a conflict.

av6 - - Load All Authors

File last commit:

r30558:7817df55 stable


                r52974:a021da4e

default

Download file

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

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

              r9999
            
      <item>

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

        av6
    
hgweb: add missing slash to file log url in rss style

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

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

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

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

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<item>
		<title>{desc\|strip\|firstline\|strip\|escape}</title>
av6 hgweb: add missing slash to file log url in rss style	r30558	<link>{urlbase}{url\|urlescape}log/{node\|short}/{file\|urlescape}</link>
Steven Brown hgweb: apply websub filter to the changeset description in rss and atom feeds...	r21486	<description><![CDATA[{desc\|strip\|escape\|websub\|addbreaks\|nonempty}]]></description>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<author>{author\|obfuscate}</author>
		<pubDate>{date\|rfc822date}</pubDate>
		</item>