upstream/mercurial-mirror Files · tests/test-revert-flags.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)

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22302:9472284d

stable

Download file

             test-revert-flags.t
        
                    23 lines
            
             | 336 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-flags.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" execbit || exit 80

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ chmod 644 foo

        $ hg ci -qAm '644'

        $ chmod 755 foo

        $ hg ci -qAm '755'

      reverting to rev 0

        $ hg revert -a -r 0

        reverting foo

        $ hg st

        M foo

        $ hg diff --git

        diff --git a/foo b/foo

        old mode 100755

        new mode 100644

        $ 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

				$ "$TESTDIR/hghave" execbit \|\| exit 80

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ chmod 644 foo
				$ hg ci -qAm '644'

				$ chmod 755 foo
				$ hg ci -qAm '755'

				reverting to rev 0

				$ hg revert -a -r 0
				reverting foo
				$ hg st
				M foo
				$ hg diff --git
				diff --git a/foo b/foo
				old mode 100755
				new mode 100644

				$ cd ..