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

FUJIWARA Katsunori - - Load All Authors

File last commit:

r24838:b2c1ff96 stable


                r32255:7e35d31b

default

Download file

             test-clone-pull-corruption.t
        
                    52 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-clone-pull-corruption.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Corrupt an hg repo with a pull started during an aborted commit

      Create two repos, so that one of them can pull from the other one.

        $ hg init source

        $ cd source

        $ touch foo

        $ hg add foo

        $ hg ci -m 'add foo'

        $ hg clone . ../corrupted

        updating to branch default

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

        $ echo >> foo

        $ hg ci -m 'change foo'

      Add a hook to wait 5 seconds and then abort the commit

        $ cd ../corrupted

        $ echo "[hooks]" >> .hg/hgrc

        $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc

      start a commit...

        $ touch bar

        $ hg add bar

        $ hg ci -m 'add bar' &

      ... and start a pull while the commit is still running

        $ sleep 1

        $ hg pull ../source 2>/dev/null

        pulling from ../source

        transaction abort!

        rollback completed

        abort: pretxncommit hook exited with status 1

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

      see what happened

        $ wait

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ 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

				Corrupt an hg repo with a pull started during an aborted commit
				Create two repos, so that one of them can pull from the other one.

				$ hg init source
				$ cd source
				$ touch foo
				$ hg add foo
				$ hg ci -m 'add foo'
				$ hg clone . ../corrupted
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo >> foo
				$ hg ci -m 'change foo'

				Add a hook to wait 5 seconds and then abort the commit

				$ cd ../corrupted
				$ echo "[hooks]" >> .hg/hgrc
				$ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc

				start a commit...

				$ touch bar
				$ hg add bar
				$ hg ci -m 'add bar' &

				... and start a pull while the commit is still running

				$ sleep 1
				$ hg pull ../source 2>/dev/null
				pulling from ../source
				transaction abort!
				rollback completed
				abort: pretxncommit hook exited with status 1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				see what happened

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

				$ cd ..