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

Johan Bjork - - Load All Authors

File last commit:

r21274:3b4c7569 default


                r32255:7e35d31b

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