upstream/mercurial-mirror Files · mercurial/templates/spartan/branches.tmpl

tests: test divergence created during interrupted rebase...

tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

av6 - - Load All Authors

File last commit:

r25526:32f76ecc default


                r47586:6648307d

default

Download file

             branches.tmpl
        
                    27 lines
            
             | 1.0 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / branches.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: branches</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-branches" title="Atom feed for {repo|escape}: branches">

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-branches" title="RSS feed for {repo|escape}: branches">

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a>

      <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a>

      <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a>

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a>

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      <a type="application/rss+xml" href="{url|urlescape}rss-branches">rss</a>

      <a type="application/atom+xml" href="{url|urlescape}atom-branches">atom</a>

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / branches</h2>

      <ul id="tagEntries">

      {entries%branchentry}

      </ul>

      {footer}

	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

				{header}
				<title>{repo\|escape}: branches</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-branches" title="Atom feed for {repo\|escape}: branches">
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-branches" title="RSS feed for {repo\|escape}: branches">
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a>
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<a type="application/rss+xml" href="{url\|urlescape}rss-branches">rss</a>
				<a type="application/atom+xml" href="{url\|urlescape}atom-branches">atom</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / branches</h2>

				<ul id="tagEntries">
				{entries%branchentry}
				</ul>

				{footer}