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

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Mads Kiilerich - - Load All Authors

File last commit:

r12640:6cc4b14f default


                r13155:f02d7a56

default

Download file

             test-journal-exists.t
        
                    34 lines
            
             | 741 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!

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

        $ 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

	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!
				[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:

				$ 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