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

Matt Mackall - - Load All Authors

File last commit:

r12365:22f3353b default


                r13155:f02d7a56

default

Download file

             test-simple-update.t
        
                    52 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-simple-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ mkdir test

        $ cd test

        $ echo foo>foo

        $ hg init

        $ hg addremove

        adding foo

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg clone . ../branch

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd ../branch

        $ hg co

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

        $ echo bar>>foo

        $ hg commit -m "2"

        $ cd ../test

        $ hg pull ../branch

        pulling from ../branch

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ hg co

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat foo

        foo

        bar

        $ hg manifest --debug

        6f4310b00b9a147241b071a60c28a650827fb03d 644   foo

	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

				$ mkdir test
				$ cd test
				$ echo foo>foo
				$ hg init
				$ hg addremove
				adding foo
				$ hg commit -m "1"

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg clone . ../branch
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ../branch
				$ hg co
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo bar>>foo
				$ hg commit -m "2"

				$ cd ../test

				$ hg pull ../branch
				pulling from ../branch
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 2 changesets, 2 total revisions

				$ hg co
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat foo
				foo
				bar

				$ hg manifest --debug
				6f4310b00b9a147241b071a60c28a650827fb03d 644 foo