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

r19929:ab2362e1 default


                r32255:7e35d31b

default

Download file

             test-empty.t
        
                    53 lines
            
             | 820 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-empty.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Create an empty repo:

        $ hg init a

        $ cd a

      Try some commands:

        $ hg log

        $ hg grep wah

        [1]

        $ hg manifest

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

      Check the basic files created:

        $ ls .hg

        00changelog.i

        requires

        store

      Should be empty:

        $ ls .hg/store

      Poke at a clone:

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

        $ ls .hg

        00changelog.i

        hgrc

        requires

        store

      Should be empty:

        $ ls .hg/store

        $ 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

				Create an empty repo:

				$ hg init a
				$ cd a

				Try some commands:

				$ hg log
				$ hg grep wah
				[1]
				$ hg manifest
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions

				Check the basic files created:

				$ ls .hg
				00changelog.i
				requires
				store

				Should be empty:

				$ ls .hg/store

				Poke at a clone:

				$ cd ..
				$ hg clone a b
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd b
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions
				$ ls .hg
				00changelog.i
				hgrc
				requires
				store

				Should be empty:

				$ ls .hg/store

				$ cd ..