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

Bryan O'Sullivan - - Load All Authors

File last commit:

r17132:b87acfda default


                r22180:17011b36

stable

Download file

             test-revlog-packentry.t
        
                    23 lines
            
             | 591 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-packentry.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ touch foo

        $ hg ci -Am 'add foo'

        adding foo

        $ hg up -C null

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

      this should be stored as a delta against rev 0

        $ echo foo bar baz > foo

        $ hg ci -Am 'add foo again'

        adding foo

        created new head

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       0  .....       0 b80de5d13875 000000000000 000000000000 (re)

             1         0      24  .....       1 0376abec49b8 000000000000 000000000000 (re)

        $ 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

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

				$ hg up -C null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				this should be stored as a delta against rev 0

				$ echo foo bar baz > foo
				$ hg ci -Am 'add foo again'
				adding foo
				created new head

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re)
				1 0 24 ..... 1 0376abec49b8 000000000000 000000000000 (re)

				$ cd ..