upstream/mercurial-mirror Files · tests/helpers-testrepo.sh

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

timeless - - Load All Authors

File last commit:

r29219:3c9066ed default


                r32255:7e35d31b

default

Download file

             helpers-testrepo.sh
        
                    19 lines
            
             | 678 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / helpers-testrepo.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # The test-repo is a live hg repository which may have evolution

      # markers created, e.g. when a ~/.hgrc enabled evolution.

      #

      # Tests are run using a custom HGRCPATH, which do not

      # enable evolution markers by default.

      #

      # If test-repo includes evolution markers, and we do not

      # enable evolution markers, hg will occasionally complain

      # when it notices them, which disrupts tests resulting in

      # sporadic failures.

      #

      # Since we aren't performing any write operations on the

      # test-repo, there's no harm in telling hg that we support

      # evolution markers, which is what the following lines

      # for the hgrc file do:

      cat >> $HGRCPATH << EOF

      [experimental]

      evolution=createmarkers

      EOF

	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

				# The test-repo is a live hg repository which may have evolution
				# markers created, e.g. when a ~/.hgrc enabled evolution.
				#
				# Tests are run using a custom HGRCPATH, which do not
				# enable evolution markers by default.
				#
				# If test-repo includes evolution markers, and we do not
				# enable evolution markers, hg will occasionally complain
				# when it notices them, which disrupts tests resulting in
				# sporadic failures.
				#
				# Since we aren't performing any write operations on the
				# test-repo, there's no harm in telling hg that we support
				# evolution markers, which is what the following lines
				# for the hgrc file do:
				cat >> $HGRCPATH << EOF
				[experimental]
				evolution=createmarkers
				EOF