upstream/mercurial-mirror Files · tests/test-diff-issue2761.t

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

timeless@mozdev.org - - Load All Authors

File last commit:

r17486:73e3e368 default


                r22286:3f3b9483

default

Download file

             test-diff-issue2761.t
        
                    23 lines
            
             | 442 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-issue2761.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Idan Kamara
    
localrepo: don't add deleted files to list of modified/added files (issue2761)...

              r13929
            
      Test issue2761

        $ hg init

        $ touch to-be-deleted

        $ hg add

        adding to-be-deleted

        $ hg ci -m first

        $ echo a > to-be-deleted

        $ hg ci -m second

        $ rm to-be-deleted

        $ hg diff -r 0

      Same issue, different code path

        $ hg up -C

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

        timeless@mozdev.org
    
spelling: doesn't/does not

              r17486
            
        $ touch does-not-exist-in-1

        Idan Kamara
    
localrepo: don't add deleted files to list of modified/added files (issue2761)...

              r13929
            
        $ hg add

        timeless@mozdev.org
    
spelling: doesn't/does not

              r17486
            
        adding does-not-exist-in-1

        Idan Kamara
    
localrepo: don't add deleted files to list of modified/added files (issue2761)...

              r13929
            
        $ hg ci -m third

        timeless@mozdev.org
    
spelling: doesn't/does not

              r17486
            
        $ rm does-not-exist-in-1

        Idan Kamara
    
localrepo: don't add deleted files to list of modified/added files (issue2761)...

              r13929
            
        $ hg diff -r 1

	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

Idan Kamara localrepo: don't add deleted files to list of modified/added files (issue2761)...	r13929	Test issue2761

		$ hg init

		$ touch to-be-deleted
		$ hg add
		adding to-be-deleted
		$ hg ci -m first
		$ echo a > to-be-deleted
		$ hg ci -m second
		$ rm to-be-deleted
		$ hg diff -r 0

		Same issue, different code path

		$ hg up -C
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
timeless@mozdev.org spelling: doesn't/does not	r17486	$ touch does-not-exist-in-1
Idan Kamara localrepo: don't add deleted files to list of modified/added files (issue2761)...	r13929	$ hg add
timeless@mozdev.org spelling: doesn't/does not	r17486	adding does-not-exist-in-1
Idan Kamara localrepo: don't add deleted files to list of modified/added files (issue2761)...	r13929	$ hg ci -m third
timeless@mozdev.org spelling: doesn't/does not	r17486	$ rm does-not-exist-in-1
Idan Kamara localrepo: don't add deleted files to list of modified/added files (issue2761)...	r13929	$ hg diff -r 1