upstream/mercurial-mirror Files · tests/test-pull-pull-corruption2.t

subrepos: abort commit by default if a subrepo is dirty (BC)...

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

Matt Mackall - - Load All Authors

File last commit:

r12482:2f8740c6 default


                r15321:e174353e

stable

Download file

             test-pull-pull-corruption2.t
        
                    44 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-pull-corruption2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Corrupt an hg repo with two pulls.

      create one repo with a long history

        $ hg init source1

        $ cd source1

        $ touch foo

        $ hg add foo

        $ for i in 1 2 3 4 5 6 7 8 9 10; do

        >     echo $i >> foo

        >     hg ci -m $i

        > done

        $ cd ..

      create a third repo to pull both other repos into it

        $ hg init version2

        $ hg -R version2 pull source1 &

        $ sleep 1

        pulling from source1

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 10 changesets with 10 changes to 1 files

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

        $ hg clone --pull -U version2 corrupted

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 10 changesets with 10 changes to 1 files

        $ wait

        $ hg -R corrupted verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 10 changesets, 10 total revisions

        $ hg -R version2 verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 10 changesets, 10 total revisions

	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 two pulls.
				create one repo with a long history

				$ hg init source1
				$ cd source1
				$ touch foo
				$ hg add foo
				$ for i in 1 2 3 4 5 6 7 8 9 10; do
				> echo $i >> foo
				> hg ci -m $i
				> done
				$ cd ..

				create a third repo to pull both other repos into it

				$ hg init version2
				$ hg -R version2 pull source1 &
				$ sleep 1
				pulling from source1
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 10 changesets with 10 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg clone --pull -U version2 corrupted
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 10 changesets with 10 changes to 1 files
				$ wait
				$ hg -R corrupted verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 10 changesets, 10 total revisions
				$ hg -R version2 verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 10 changesets, 10 total revisions