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

Kyle Lippincott - - Load All Authors

File last commit:

r40377:d916ed3c default


                r41920:d5edb5d3

default

Download file

             test-revisions.t
        
                    45 lines
            
             | 656 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revisions.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo 0 > a

        $ hg ci -qAm 0

        $ for i in 5 8 14 43 167; do

        >   hg up -q 0

        >   echo $i > a

        >   hg ci -qm $i

        > done

        $ cat <<EOF >> .hg/hgrc

        > [alias]

        > l = log -T '{rev}:{shortest(node,1)}\n'

        > EOF

        $ hg l

        5:00f

        4:7ba5d

        3:7ba57

        2:72

        1:9

        0:b

        $ cat <<EOF >> .hg/hgrc

        > [experimental]

        > revisions.disambiguatewithin=not 4

        > EOF

        $ hg l

        5:00

        4:7ba5d

        3:7b

        2:72

        1:9

        0:b

      9 was unambiguous and still is

        $ hg l -r 9

        1:9

      7 was ambiguous and still is

        $ hg l -r 7

        abort: 00changelog.i@7: ambiguous identifier!

        [255]

      7b is no longer ambiguous

        $ hg l -r 7b

        3:7b

        $ 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

				$ hg init repo
				$ cd repo

				$ echo 0 > a
				$ hg ci -qAm 0
				$ for i in 5 8 14 43 167; do
				> hg up -q 0
				> echo $i > a
				> hg ci -qm $i
				> done
				$ cat <<EOF >> .hg/hgrc
				> [alias]
				> l = log -T '{rev}:{shortest(node,1)}\n'
				> EOF

				$ hg l
				5:00f
				4:7ba5d
				3:7ba57
				2:72
				1:9
				0:b
				$ cat <<EOF >> .hg/hgrc
				> [experimental]
				> revisions.disambiguatewithin=not 4
				> EOF
				$ hg l
				5:00
				4:7ba5d
				3:7b
				2:72
				1:9
				0:b
				9 was unambiguous and still is
				$ hg l -r 9
				1:9
				7 was ambiguous and still is
				$ hg l -r 7
				abort: 00changelog.i@7: ambiguous identifier!
				[255]
				7b is no longer ambiguous
				$ hg l -r 7b
				3:7b

				$ cd ..