##// END OF EJS Templates
tests: update divergence test for `hg fix` to actually result in divergence...
tests: update divergence test for `hg fix` to actually result in divergence We have a test that checks that `hg fix` errors out if it might cause divergence. However, the test simply prunes the commit it then tries to fix, so fixing it wouldn't actually cause divergence. That works because the implementation is simple enough that it doesn't notice the difference. I'm about to make the implementation smarter, so let's fix the test first. Differential Revision: https://phab.mercurial-scm.org/D10267

File last commit:

r29437:6ab3465d default
r47594:d083c120 default
Show More
branchentry.tmpl
8 lines | 315 B | application/x-cheetah | CheetahLexer
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <entry>
<title>{branch|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
<id>{urlbase}{url|urlescape}#branch-{node}</id>
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
av6
hgweb: remove unnecessary CDATA markup in atom/branchentry.tmpl...
r29437 <content type="text">{branch|strip|escape}</content>
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 </entry>