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

Mark Thomas - - Load All Authors

File last commit:

r40226:31dfa7da default


                r41920:d5edb5d3

default

Download file

             test-absorb-phase.t
        
                    30 lines
            
             | 389 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-phase.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        > drawdag=$TESTDIR/drawdag.py

        > EOF

        $ hg init

        $ hg debugdrawdag <<'EOS'

        > C

        > |

        > B

        > |

        > A

        > EOS

        $ hg phase -r A --public -q

        $ hg phase -r C --secret --force -q

        $ hg update C -q

        $ printf B1 > B

        $ hg absorb -aq

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

        @  C secret

        |

        o  B draft

        |

        o  A public

	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

				$ cat >> $HGRCPATH << EOF
				> [extensions]
				> absorb=
				> drawdag=$TESTDIR/drawdag.py
				> EOF

				$ hg init
				$ hg debugdrawdag <<'EOS'
				> C
				> \|
				> B
				> \|
				> A
				> EOS

				$ hg phase -r A --public -q
				$ hg phase -r C --secret --force -q

				$ hg update C -q
				$ printf B1 > B

				$ hg absorb -aq

				$ hg log -G -T '{desc} {phase}'
				@ C secret
				\|
				o B draft
				\|
				o A public