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

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

av6 - - Load All Authors

File last commit:

r25526:32f76ecc default


                r44638:1850066f

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}