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

r12316:4134686b default


                r13155:f02d7a56

default

Download file

             test-update-issue1456.t
        
                    33 lines
            
             | 630 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-issue1456.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo foo > foo

        $ hg ci -qAm0

        $ chmod +x foo

        $ hg ci -m1

        $ hg co -q 0

        $ echo dirty > foo

        $ hg up -c

        abort: uncommitted local changes

        [255]

        $ hg up -q

        $ cat foo

        dirty

        $ hg st -A

        M foo

      Validate update of standalone execute bit change:

        $ hg up -C 0

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

        $ chmod -x foo

        $ hg ci -m removeexec

        nothing changed

        [1]

        $ hg up -C 0

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

        $ hg up

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

        $ hg st

	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

				$ rm -rf a
				$ hg init a
				$ cd a

				$ echo foo > foo
				$ hg ci -qAm0
				$ chmod +x foo
				$ hg ci -m1
				$ hg co -q 0
				$ echo dirty > foo
				$ hg up -c
				abort: uncommitted local changes
				[255]
				$ hg up -q
				$ cat foo
				dirty
				$ hg st -A
				M foo

				Validate update of standalone execute bit change:

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ chmod -x foo
				$ hg ci -m removeexec
				nothing changed
				[1]
				$ hg up -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg up
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st