upstream/mercurial-mirror Files · tests/test-issue5979.t

graft: do not try to skip rev derived from ancestor more than once (issue6024)...

graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

Matt Harbison - - Load All Authors

File last commit:

r40405:ef6cab79 default


                r40692:3bc2e550

stable

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