##// END OF EJS Templates
rebase: move working parent and bookmark for obsoleted revs (BC)...
rebase: move working parent and bookmark for obsoleted revs (BC) Previously, obsoleted revs with successors in destination are completely ignored. That caused some inconvenience when working copy is obsoleted. Most commands avoid working copy being obsoleted, but `hg pull` is an exception. This patch makes rebase able to move bookmarks or working parent for those obsoleted revs. It does so by keeping the obsoleted revs in `state` and marking them as "skipped, rebased to desired destination" during run-time. This reverts part of the behavior change of 3b7cb3d17137 and D24. Differential Revision: https://phab.mercurial-scm.org/D527

File last commit:

r29436:849b8e84 default
r34010:9422107a default
Show More
changelogentry.tmpl
41 lines | 1.5 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <item>
Aaron Jensen
hgweb: adding branch names from inbranch template to rss feed
r21118 <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>
av6
hgweb: reindent rss/changelogentry.tmpl...
r29436 <link>{urlbase}{url|urlescape}rev/{node|short}</link>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 <description>
av6
hgweb: reindent rss/changelogentry.tmpl...
r29436 <![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>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>