upstream/mercurial-mirror Files · mercurial/templates/raw/logentry.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

Alexander Plavin - - Load All Authors

File last commit:

r19429:c8490dcc default


                r46041:49ffaa4f

default

Download file

             logentry.tmpl
        
                    6 lines
            
             | 172 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / raw / logentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      changeset:   {node}

      revision:    {rev}

      user:        {author}

      date:        {date|rfc822date}

      summary:     {desc}

      {branches%branchname}{tags%tagname}{bookmarks%bookmarkname}

	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

				changeset: {node}
				revision: {rev}
				user: {author}
				date: {date\|rfc822date}
				summary: {desc}
				{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}