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

Adrian Buehlmann - - Load All Authors

File last commit:

r12285:5d9bc49b default


                r32255:7e35d31b

default

Download file

             test-debugrename.t
        
                    18 lines
            
             | 371 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-debugrename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -Am t

        adding a

        $ hg mv a b

        $ hg ci -Am t1

        $ hg debugrename b

        b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

        $ hg mv b a

        $ hg ci -Am t2

        $ hg debugrename a

        a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980

        $ hg debugrename --rev 1 b

        b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

	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
				$ echo a > a
				$ hg ci -Am t
				adding a

				$ hg mv a b
				$ hg ci -Am t1
				$ hg debugrename b
				b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

				$ hg mv b a
				$ hg ci -Am t2
				$ hg debugrename a
				a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980

				$ hg debugrename --rev 1 b
				b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3