upstream/mercurial-mirror Files · tests/test-dirstate-nonnormalset.t

dirstate: use a new `drop_merge_data` in `setparent`...

dirstate: use a new `drop_merge_data` in `setparent` What is happening in this `setparent` loop is that we remove all `merge` related information when the dirstate is moved out of a `merge` situation. So instead of shuffling state to get them where we want, we simply add a method on the DirstateItem to do drop the information we want dropped. Differential Revision: https://phab.mercurial-scm.org/D11506

Martin von Zweigbergk - - Load All Authors

File last commit:

r46350:ed84a4d4 default


                r48874:a660d8a5

default

Download file

             test-dirstate-nonnormalset.t
        
                    22 lines
            
             | 505 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dirstate-nonnormalset.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH << EOF

        > [command-templates]

        > log="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n"

        > [extensions]

        > dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py

        > [experimental]

        > nonnormalparanoidcheck = True

        > [devel]

        > all-warnings=True

        > EOF

        $ mkcommit() {

        >    echo "$1" > "$1"

        >    hg add "$1"

        >    hg ci -m "add $1"

        > }

        $ hg init testrepo

        $ cd testrepo

        $ mkcommit a

        $ mkcommit b

        $ mkcommit c

        $ hg status

	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
				> [command-templates]
				> log="{rev}:{node\|short} ({phase}) [{tags} {bookmarks}] {desc\|firstline}\n"
				> [extensions]
				> dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py
				> [experimental]
				> nonnormalparanoidcheck = True
				> [devel]
				> all-warnings=True
				> EOF
				$ mkcommit() {
				> echo "$1" > "$1"
				> hg add "$1"
				> hg ci -m "add $1"
				> }

				$ hg init testrepo
				$ cd testrepo
				$ mkcommit a
				$ mkcommit b
				$ mkcommit c
				$ hg status