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

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22180:17011b36

stable

Download file

             test-rebuildstate.t
        
                    30 lines
            
             | 366 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebuildstate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      basic test for hg debugrebuildstate

        $ hg init repo

        $ cd repo

        $ touch foo bar

        $ hg ci -Am 'add foo bar'

        adding bar

        adding foo

        $ touch baz

        $ hg add baz

        $ hg rm bar

        $ hg debugrebuildstate

      state dump after

        $ hg debugstate --nodates | sort

        n 644         -1 bar

        n 644         -1 foo

      status

        $ hg st -A

        ! bar

        ? baz

        C foo

        $ 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

				basic test for hg debugrebuildstate

				$ hg init repo
				$ cd repo

				$ touch foo bar
				$ hg ci -Am 'add foo bar'
				adding bar
				adding foo

				$ touch baz
				$ hg add baz
				$ hg rm bar

				$ hg debugrebuildstate

				state dump after

				$ hg debugstate --nodates \| sort
				n 644 -1 bar
				n 644 -1 foo

				status

				$ hg st -A
				! bar
				? baz
				C foo

				$ cd ..