upstream/mercurial-mirror Files · tests/test-journal-exists.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Johan Bjork - - Load All Authors

File last commit:

r21274:3b4c7569 default


                r22285:85bded43

default

Download file

             test-journal-exists.t
        
                    37 lines
            
             | 805 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-journal-exists.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-journal-exists

              r12205
            
        $ hg init

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg -q clone . foo

        $ touch .hg/store/journal

        $ echo foo > a

        $ hg ci -Am0

        Johan Bjork
    
journal: set Abort hint when failing due to an abandoned transaction

              r21274
            
        abort: abandoned transaction found!

        (run 'hg recover' to clean up transaction)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-journal-exists

              r12205
            
        $ hg recover

        rolling back interrupted transaction

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

      Check that zero-size journals are correctly aborted:

        Matt Mackall
    
tests: skip tests that require not having root (issue4089)...

              r20008
            
      #if unix-permissions no-root

        Adrian Buehlmann
    
tests: unify test-journal-exists

              r12205
            
        $ hg bundle -qa repo.hg

        $ chmod -w foo/.hg/store/00changelog.i

        $ hg -R foo unbundle repo.hg

        adding changesets

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-journal-exists

              r12205
            
        $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi

        Adrian Buehlmann
    
test-journal-exists: use #if

              r16959
            
      #endif

        Adrian Buehlmann
    
tests: unify test-journal-exists

              r12205

	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

Adrian Buehlmann tests: unify test-journal-exists	r12205	$ hg init
		$ echo a > a
		$ hg ci -Am0
		adding a

		$ hg -q clone . foo

		$ touch .hg/store/journal

		$ echo foo > a
		$ hg ci -Am0
Johan Bjork journal: set Abort hint when failing due to an abandoned transaction	r21274	abort: abandoned transaction found!
		(run 'hg recover' to clean up transaction)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-journal-exists	r12205
		$ hg recover
		rolling back interrupted transaction
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

		Check that zero-size journals are correctly aborted:

Matt Mackall tests: skip tests that require not having root (issue4089)...	r20008	#if unix-permissions no-root
Adrian Buehlmann tests: unify test-journal-exists	r12205	$ hg bundle -qa repo.hg
		$ chmod -w foo/.hg/store/00changelog.i

		$ hg -R foo unbundle repo.hg
		adding changesets
Mads Kiilerich tests: remove redundant globs...	r12640	abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-journal-exists	r12205
		$ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
Adrian Buehlmann test-journal-exists: use #if	r16959	#endif
Adrian Buehlmann tests: unify test-journal-exists	r12205