upstream/mercurial-mirror Files · tests/test-push-validation.t

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Mads Kiilerich - - Load All Authors

File last commit:

r18506:ef60083b stable


                r22284:72b37865

default

Download file

             test-push-validation.t
        
                    92 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-validation.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init test

        $ cd test

        $ cat > .hg/hgrc <<EOF

        > [server]

        > validate=1

        > EOF

        $ echo alpha > alpha

        $ echo beta > beta

        $ hg addr

        adding alpha

        adding beta

        $ hg ci -m 1

        $ cd ..

        $ hg clone test test-clone

        updating to branch default

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

      Test spurious filelog entries:

        $ cd test-clone

        $ echo blah >> beta

        $ cp .hg/store/data/beta.i tmp1

        $ hg ci -m 2

        $ cp .hg/store/data/beta.i tmp2

        $ hg -q rollback

        $ mv tmp2 .hg/store/data/beta.i

        $ echo blah >> beta

        $ hg ci -m '2 (corrupt)'

      Expected to fail:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         beta@1: dddc47b3ba30 not in manifests

        2 files, 2 changesets, 4 total revisions

        1 integrity errors encountered!

        (first damaged changeset appears to be 1)

        [1]

        $ hg push

        pushing to $TESTTMP/test (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        transaction abort!

        rollback completed

        abort: received spurious file revlog entry

        [255]

        $ hg -q rollback

        $ mv tmp1 .hg/store/data/beta.i

        $ echo beta > beta

      Test missing filelog entries:

        $ cp .hg/store/data/beta.i tmp

        $ echo blah >> beta

        $ hg ci -m '2 (corrupt)'

        $ mv tmp .hg/store/data/beta.i

      Expected to fail:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         beta@1: dddc47b3ba30 in manifests not found

        2 files, 2 changesets, 2 total revisions

        1 integrity errors encountered!

        (first damaged changeset appears to be 1)

        [1]

        $ hg push

        pushing to $TESTTMP/test (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        transaction abort!

        rollback completed

        abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify

        [255]

        $ 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 test
				$ cd test

				$ cat > .hg/hgrc <<EOF
				> [server]
				> validate=1
				> EOF

				$ echo alpha > alpha
				$ echo beta > beta
				$ hg addr
				adding alpha
				adding beta
				$ hg ci -m 1

				$ cd ..
				$ hg clone test test-clone
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test spurious filelog entries:

				$ cd test-clone
				$ echo blah >> beta
				$ cp .hg/store/data/beta.i tmp1
				$ hg ci -m 2
				$ cp .hg/store/data/beta.i tmp2
				$ hg -q rollback
				$ mv tmp2 .hg/store/data/beta.i
				$ echo blah >> beta
				$ hg ci -m '2 (corrupt)'

				Expected to fail:

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				beta@1: dddc47b3ba30 not in manifests
				2 files, 2 changesets, 4 total revisions
				1 integrity errors encountered!
				(first damaged changeset appears to be 1)
				[1]

				$ hg push
				pushing to $TESTTMP/test (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				transaction abort!
				rollback completed
				abort: received spurious file revlog entry
				[255]

				$ hg -q rollback
				$ mv tmp1 .hg/store/data/beta.i
				$ echo beta > beta

				Test missing filelog entries:

				$ cp .hg/store/data/beta.i tmp
				$ echo blah >> beta
				$ hg ci -m '2 (corrupt)'
				$ mv tmp .hg/store/data/beta.i

				Expected to fail:

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				beta@1: dddc47b3ba30 in manifests not found
				2 files, 2 changesets, 2 total revisions
				1 integrity errors encountered!
				(first damaged changeset appears to be 1)
				[1]

				$ hg push
				pushing to $TESTTMP/test (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				transaction abort!
				rollback completed
				abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
				[255]

				$ cd ..