upstream/mercurial-mirror Files · mercurial/templates/gitweb/graphentry.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:

r35549:6c226473 default


                r47586:6648307d

default

Download file

             graphentry.tmpl
        
                    9 lines
            
             | 320 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / graphentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        av6
    
gitweb: make actual changeset entries have backgrounds on /graph...

              r35549
            
      <li class="parity{parity}" data-node="{node|short}">

       <div class="fg">

        <span class="desc">

         <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><b>{desc|strip|firstline|escape|nonempty}</b></a>

        </span>

        {alltags}

        <div class="info">{date|age}, by {author|person}</div>

       </div>

        av6
    
gitweb: render changesets server-side on /graph page

              r35220
            
      </li>

	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

av6 gitweb: make actual changeset entries have backgrounds on /graph...	r35549	<li class="parity{parity}" data-node="{node\|short}">
		<div class="fg">
		<span class="desc">
		<a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}"><b>{desc\|strip\|firstline\|escape\|nonempty}</b></a>
		</span>
		{alltags}
		<div class="info">{date\|age}, by {author\|person}</div>
		</div>
av6 gitweb: render changesets server-side on /graph page	r35220	</li>