upstream/mercurial-mirror Files · tests/test-execute-bit.t

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.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r32255:7e35d31b

default

Download file

             test-execute-bit.t
        
                    28 lines
            
             | 541 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-execute-bit.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

        $ hg init

        $ echo a > a

        $ hg ci -Am'not executable'

        adding a

        $ chmod +x a

        $ hg ci -m'executable'

        $ hg id

        79abf14474dc tip

      Make sure we notice the change of mode if the cached size == -1:

        $ hg rm a

        $ hg revert -r 0 a

        $ hg debugstate

        n   0         -1 unset               a

        $ hg status

        M a

        $ hg up 0

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg id

        d69afc33ff8a

        $ test -x a && echo executable -- bad || echo not executable -- good

        not executable -- good

	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

				#require execbit

				$ hg init
				$ echo a > a
				$ hg ci -Am'not executable'
				adding a

				$ chmod +x a
				$ hg ci -m'executable'
				$ hg id
				79abf14474dc tip

				Make sure we notice the change of mode if the cached size == -1:

				$ hg rm a
				$ hg revert -r 0 a
				$ hg debugstate
				n 0 -1 unset a
				$ hg status
				M a

				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg id
				d69afc33ff8a
				$ test -x a && echo executable -- bad \|\| echo not executable -- good
				not executable -- good