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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Johan Bjork - - Load All Authors

File last commit:

r21274:3b4c7569 default


                r27025:ec372573

default

Download file

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

        $ hg init

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg -q clone . foo

        $ touch .hg/store/journal

        $ echo foo > a

        $ hg ci -Am0

        abort: abandoned transaction found!

        (run 'hg recover' to clean up transaction)

        [255]

        $ 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:

      #if unix-permissions no-root

        $ hg bundle -qa repo.hg

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

        $ hg -R foo unbundle repo.hg

        adding changesets

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

        [255]

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

      #endif

	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
				$ echo a > a
				$ hg ci -Am0
				adding a

				$ hg -q clone . foo

				$ touch .hg/store/journal

				$ echo foo > a
				$ hg ci -Am0
				abort: abandoned transaction found!
				(run 'hg recover' to clean up transaction)
				[255]

				$ 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:

				#if unix-permissions no-root
				$ hg bundle -qa repo.hg
				$ chmod -w foo/.hg/store/00changelog.i

				$ hg -R foo unbundle repo.hg
				adding changesets
				abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob)
				[255]

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