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

r26420:2fc86d92 default


                r32255:7e35d31b

default

Download file

             test-issue1089.t
        
                    26 lines
            
             | 312 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1089.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/1089

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir a

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        removing a/b (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -m m a

        $ mkdir a b

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        removing a/b (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ cd b

      Relative delete:

        $ hg ci -m m ../a

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/1089
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir a
		$ echo a > a/b
		$ hg ci -Am m
		adding a/b

		$ hg rm a
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	removing a/b (glob)
Adrian Buehlmann tests: unify test-issue*	r12195	$ hg ci -m m a

		$ mkdir a b
		$ echo a > a/b
		$ hg ci -Am m
		adding a/b

		$ hg rm a
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	removing a/b (glob)
Adrian Buehlmann tests: unify test-issue*	r12195	$ cd b

		Relative delete:

		$ hg ci -m m ../a

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..