upstream/mercurial-mirror Files · tests/test-rebuildstate.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-rebuildstate.t
        
                    30 lines
            
             | 366 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebuildstate.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-rebuildstate

              r12121
            
      basic test for hg debugrebuildstate

        $ hg init repo

        $ cd repo

        $ touch foo bar

        $ hg ci -Am 'add foo bar'

        adding bar

        adding foo

        $ touch baz

        $ hg add baz

        $ hg rm bar

        $ hg debugrebuildstate

      state dump after

        $ hg debugstate --nodates | sort

        Mads Kiilerich
    
windows: use umask 022 in debugstate output...

              r15440
            
        n 644         -1 bar

        n 644         -1 foo

        Nicolas Dumazet
    
tests: unify test-rebuildstate

              r12121
            
      status

        $ hg st -A

        ! bar

        ? baz

        C foo

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Nicolas Dumazet tests: unify test-rebuildstate	r12121	basic test for hg debugrebuildstate

		$ hg init repo
		$ cd repo

		$ touch foo bar
		$ hg ci -Am 'add foo bar'
		adding bar
		adding foo

		$ touch baz
		$ hg add baz
		$ hg rm bar

		$ hg debugrebuildstate

		state dump after

		$ hg debugstate --nodates \| sort
Mads Kiilerich windows: use umask 022 in debugstate output...	r15440	n 644 -1 bar
		n 644 -1 foo
Nicolas Dumazet tests: unify test-rebuildstate	r12121
		status

		$ hg st -A
		! bar
		? baz
		C foo

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..