upstream/mercurial-mirror Files · mercurial/templates/atom/error.tmpl

merge: add missing ACTION_KEEP when both remote and ancestor are not present...

merge: add missing ACTION_KEEP when both remote and ancestor are not present Previous patch may lead to confusion that the related criss-cross merge is consistent when done from any of the parents. However this is not true and we were missing setting an ACTION_KEEP. This patch now exposes that bid-merge favors ACTION_KEEP always and the result of merge is different when started from different parents. This change also effects a test case above where bid merge was wrongly picking `r` because it was missing keep related information from one of the ancestor. After this test, we are back in a state in the criss-cross merge tests where the result depends on which parent we are merging from. Differential Revision: https://phab.mercurial-scm.org/D8941

Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default


                r46041:49ffaa4f

default

Download file

             error.tmpl
        
                    17 lines
            
             | 484 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / atom / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

       <!-- Error -->

       <id>{urlbase}{url|urlescape}</id>

       <link rel="self" href="{urlbase}{url|urlescape}atom-log"/>

       <link rel="alternate" href="{urlbase}{url|urlescape}"/>

       <title>Error</title>

       <updated>1970-01-01T00:00:00+00:00</updated>

       <entry>

        <title>Error</title>

        <id>https://mercurial-scm.org/#error</id>

        <author>

          <name>mercurial</name>

        </author>

        <updated>1970-01-01T00:00:00+00:00</updated>

        <content type="text">{error|escape}</content>

       </entry>

      </feed>

	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}
				<!-- Error -->
				<id>{urlbase}{url\|urlescape}</id>
				<link rel="self" href="{urlbase}{url\|urlescape}atom-log"/>
				<link rel="alternate" href="{urlbase}{url\|urlescape}"/>
				<title>Error</title>
				<updated>1970-01-01T00:00:00+00:00</updated>
				<entry>
				<title>Error</title>
				<id>https://mercurial-scm.org/#error</id>
				<author>
				<name>mercurial</name>
				</author>
				<updated>1970-01-01T00:00:00+00:00</updated>
				<content type="text">{error\|escape}</content>
				</entry>
				</feed>