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

Bryan O'Sullivan - - Load All Authors

File last commit:

r31964:ebaada96 default


                r32255:7e35d31b

default

Download file

             test-basic.t
        
                    91 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-basic.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Create a repository:

        $ hg config

        defaults.backout=-d "0 0"

        defaults.commit=-d "0 0"

        defaults.shelve=--date "0 0"

        defaults.tag=-d "0 0"

        devel.all-warnings=true

        largefiles.usercache=$TESTTMP/.cache/largefiles (glob)

        ui.slash=True

        ui.interactive=False

        ui.mergemarkers=detailed

        ui.promptecho=True

        web.address=localhost

        web\.ipv6=(?:True|False) (re)

        $ hg init t

        $ cd t

      Prepare a changeset:

        $ echo a > a

        $ hg add a

        $ hg status

        A a

      Writes to stdio succeed and fail appropriately

      #if devfull

        $ hg status 2>/dev/full

        A a

        $ hg status >/dev/full

        abort: No space left on device

        [255]

        $ hg status >/dev/full 2>&1

        [1]

        $ hg status ENOENT 2>/dev/full

        [1]

      #endif

        $ hg commit -m test

      This command is ancient:

        $ hg history

        changeset:   0:acb14030fe0a

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     test

      Verify that updating to revision 0 via commands.update() works properly

        $ cat <<EOF > update_to_rev0.py

        > from mercurial import ui, hg, commands

        > myui = ui.ui.load()

        > repo = hg.repository(myui, path='.')

        > commands.update(myui, repo, rev=0)

        > EOF

        $ hg up null

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

        $ python ./update_to_rev0.py

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

        $ hg identify -n

        0

      Poke around at hashes:

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        $ hg cat a

        a

      Verify should succeed:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

      At the end...

        $ 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 a repository:

				$ hg config
				defaults.backout=-d "0 0"
				defaults.commit=-d "0 0"
				defaults.shelve=--date "0 0"
				defaults.tag=-d "0 0"
				devel.all-warnings=true
				largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
				ui.slash=True
				ui.interactive=False
				ui.mergemarkers=detailed
				ui.promptecho=True
				web.address=localhost
				web\.ipv6=(?:True\|False) (re)
				$ hg init t
				$ cd t

				Prepare a changeset:

				$ echo a > a
				$ hg add a

				$ hg status
				A a

				Writes to stdio succeed and fail appropriately

				#if devfull
				$ hg status 2>/dev/full
				A a

				$ hg status >/dev/full
				abort: No space left on device
				[255]

				$ hg status >/dev/full 2>&1
				[1]

				$ hg status ENOENT 2>/dev/full
				[1]
				#endif

				$ hg commit -m test

				This command is ancient:

				$ hg history
				changeset: 0:acb14030fe0a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: test


				Verify that updating to revision 0 via commands.update() works properly

				$ cat <<EOF > update_to_rev0.py
				> from mercurial import ui, hg, commands
				> myui = ui.ui.load()
				> repo = hg.repository(myui, path='.')
				> commands.update(myui, repo, rev=0)
				> EOF
				$ hg up null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ python ./update_to_rev0.py
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg identify -n
				0


				Poke around at hashes:

				$ hg manifest --debug
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a

				$ hg cat a
				a

				Verify should succeed:

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				At the end...

				$ cd ..