upstream/mercurial-mirror Files · tests/test-revert-unknown.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.

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r32255:7e35d31b

default

Download file

             test-revert-unknown.t
        
                    29 lines
            
             | 319 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-unknown.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ touch unknown

        $ touch a

        $ hg add a

        $ hg ci -m "1"

        $ touch b

        $ hg add b

        $ hg ci -m "2"

      Should show unknown

        $ hg status

        ? unknown

        $ hg revert -r 0 --all

        removing b

      Should show unknown and b removed

        $ hg status

        R b

        ? unknown

      Should show a and unknown

        $ ls

        a

        unknown

	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

				$ hg init
				$ touch unknown

				$ touch a
				$ hg add a
				$ hg ci -m "1"

				$ touch b
				$ hg add b
				$ hg ci -m "2"

				Should show unknown

				$ hg status
				? unknown
				$ hg revert -r 0 --all
				removing b

				Should show unknown and b removed

				$ hg status
				R b
				? unknown

				Should show a and unknown

				$ ls
				a
				unknown