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

Siddharth Agarwal - - Load All Authors

File last commit:

r23285:6cc1f388 default


                r32255:7e35d31b

default

Download file

             test-revlog-packentry.t
        
                    23 lines
            
             | 591 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-packentry.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ touch foo

        $ hg ci -Am 'add foo'

        adding foo

        $ hg up -C null

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

      this should be stored as a delta against rev 0

        $ echo foo bar baz > foo

        $ hg ci -Am 'add foo again'

        adding foo

        created new head

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       0  .....       0 b80de5d13875 000000000000 000000000000 (re)

             1         0      13  .....       1 0376abec49b8 000000000000 000000000000 (re)

        $ 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

				$ hg init repo
				$ cd repo

				$ touch foo
				$ hg ci -Am 'add foo'
				adding foo

				$ hg up -C null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				this should be stored as a delta against rev 0

				$ echo foo bar baz > foo
				$ hg ci -Am 'add foo again'
				adding foo
				created new head

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
				1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re)

				$ cd ..