upstream/mercurial-mirror Files · tests/test-extra-filelog-entry.t

graft: fix collision detection with origin revisions that are missing...

graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

Bryan O'Sullivan - - Load All Authors

File last commit:

r17132:b87acfda default


                r22302:9472284d

stable

Download file

             test-extra-filelog-entry.t
        
                    21 lines
            
             | 448 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-extra-filelog-entry.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue351: mq: qrefresh can create extra revlog entry

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ hg qinit

        $ echo b > b

        $ hg ci -A -m foo

        adding b

        $ echo cc > b

        $ hg qnew -f foo.diff

        $ echo b > b

        $ hg qrefresh

        $ hg debugindex b

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

             0         0       3  .....       0 1e88685f5dde 000000000000 000000000000 (re)

	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

				Issue351: mq: qrefresh can create extra revlog entry

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init
				$ hg qinit

				$ echo b > b
				$ hg ci -A -m foo
				adding b

				$ echo cc > b
				$ hg qnew -f foo.diff
				$ echo b > b
				$ hg qrefresh

				$ hg debugindex b
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re)