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

Matt Harbison - - Load All Authors

File last commit:

r40405:ef6cab79 default


                r41920:d5edb5d3

default

Download file

             test-issue5979.t
        
                    34 lines
            
             | 658 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue5979.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init r1

        $ cd r1

        $ hg ci --config ui.allowemptycommit=true -m c0

        $ hg ci --config ui.allowemptycommit=true -m c1

        $ hg ci --config ui.allowemptycommit=true -m c2

        $ hg co -q 0

        $ hg ci --config ui.allowemptycommit=true -m c3

        created new head

        $ hg co -q 3

        $ hg merge --quiet

        $ hg ci --config ui.allowemptycommit=true -m c4

        $ hg log -G -T'{desc}'

        @    c4

        |\

        | o  c3

        | |

        o |  c2

        | |

        o |  c1

        |/

        o  c0

        >>> from mercurial import hg

        >>> from mercurial import ui as uimod

        >>> repo = hg.repository(uimod.ui())

        >>> for anc in repo.changelog.ancestors([4], inclusive=True):

        ...   print(anc)

        4

        3

        2

        1

        0

	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

				$ hg init r1
				$ cd r1
				$ hg ci --config ui.allowemptycommit=true -m c0
				$ hg ci --config ui.allowemptycommit=true -m c1
				$ hg ci --config ui.allowemptycommit=true -m c2
				$ hg co -q 0
				$ hg ci --config ui.allowemptycommit=true -m c3
				created new head
				$ hg co -q 3
				$ hg merge --quiet
				$ hg ci --config ui.allowemptycommit=true -m c4

				$ hg log -G -T'{desc}'
				@ c4
				\|\
				\| o c3
				\| \|
				o \| c2
				\| \|
				o \| c1
				\|/
				o c0


				>>> from mercurial import hg
				>>> from mercurial import ui as uimod
				>>> repo = hg.repository(uimod.ui())
				>>> for anc in repo.changelog.ancestors([4], inclusive=True):
				... print(anc)
				4
				3
				2
				1
				0