upstream/mercurial-mirror Files · tests/test-narrow-debugrebuilddirstate.t

copies: filter out copies when target is not in destination manifest...

copies: filter out copies when target is not in destination manifest When chaining a series of commits that copied a file with a series that removed the destination file, we would still include the copy in the result. Similar to the previous patch, I have checked that `hg status --copies` is not affected by this bug, but I wouldn't be surprised if some commands are. Differential Revision: https://phab.mercurial-scm.org/D5989

Martin von Zweigbergk - - Load All Authors

File last commit:

r39907:01c0f01b default


                r41920:d5edb5d3

default

Download file

             test-narrow-debugrebuilddirstate.t
        
                    31 lines
            
             | 910 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-debugrebuilddirstate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$TESTDIR/narrow-library.sh"

        $ hg init master

        $ cd master

        $ echo treemanifest >> .hg/requires

        $ echo 'contents of file' > file

        $ mkdir foo

        $ echo 'contents of foo/bar' > foo/bar

        $ hg ci -Am 'some change'

        adding file

        adding foo/bar

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master copy --include=foo

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        new changesets * (glob)

        updating to branch default

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

        $ cd copy

        $ hg debugdirstate --no-dates

        n *         20 *               foo/bar (glob)

        $ mv .hg/dirstate .hg/old_dirstate

        $ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null

        $ hg debugdirstate

        $ hg debugrebuilddirstate

        $ hg debugdirstate

        n *         * unset               foo/bar (glob)

	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

				$ . "$TESTDIR/narrow-library.sh"
				$ hg init master
				$ cd master
				$ echo treemanifest >> .hg/requires
				$ echo 'contents of file' > file
				$ mkdir foo
				$ echo 'contents of foo/bar' > foo/bar
				$ hg ci -Am 'some change'
				adding file
				adding foo/bar

				$ cd ..
				$ hg clone --narrow ssh://user@dummy/master copy --include=foo
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				new changesets * (glob)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd copy

				$ hg debugdirstate --no-dates
				n * 20 * foo/bar (glob)
				$ mv .hg/dirstate .hg/old_dirstate
				$ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null
				$ hg debugdirstate
				$ hg debugrebuilddirstate
				$ hg debugdirstate
				n * * unset foo/bar (glob)