upstream/mercurial-mirror Files · mercurial/templates/rss/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
        
                    40 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <item>

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

          <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>

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

          <description>

                    <![CDATA[

      	<table>

      	<tr>

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

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

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

      		<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;vertical-align:top;">user</th>

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

      	</tr>

      	<tr>

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

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

      	</tr>

      	<tr>

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

      		<td>{files}</td>

      	</tr>

      	</table>

      	]]></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>{inbranch%"{if(name, '[{name\|escape}] ')}"}{branches%"{if(name, '[{name\|escape}] ')}"}{desc\|strip\|firstline\|strip\|escape}</title>
				<guid isPermaLink="true">{urlbase}{url\|urlescape}rev/{node\|short}</guid>
				<link>{urlbase}{url\|urlescape}rev/{node\|short}</link>
				<description>
				<![CDATA[
				<table>
				<tr>
				<th style="text-align:left;">changeset</th>
				<td>{node\|short}</td>
				</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>
				<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;vertical-align:top;">user</th>
				<td>{author\|obfuscate}</td>
				</tr>
				<tr>
				<th style="text-align:left;vertical-align:top;">description</th>
				<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
				</tr>
				<tr>
				<th style="text-align:left;vertical-align:top;">files</th>
				<td>{files}</td>
				</tr>
				</table>
				]]></description>
				<author>{author\|obfuscate}</author>
				<pubDate>{date\|rfc822date}</pubDate>
				</item>