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

bookmarks: use 'applychanges' for bookmark update...

bookmarks: use 'applychanges' for bookmark update There is still some use of 'deletedivergent' bookmark here. They will be taken care of later. The 'deletedivergent' code needs some rework before fitting in the new world.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r33491:1adcb594

default

Download file

             test-issue1438.t
        
                    23 lines
            
             | 367 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1438.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require symlink

      https://bz.mercurial-scm.org/1438

        $ hg init

        $ ln -s foo link

        $ hg add link

        $ hg ci -mbad link

        $ hg rm link

        $ hg ci -mok

        $ hg diff -g -r 0:1 > bad.patch

        $ hg up 0

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

        $ hg import --no-commit bad.patch

        applying bad.patch

        $ hg status

        R link

        ? bad.patch

	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

				#require symlink

				https://bz.mercurial-scm.org/1438

				$ hg init

				$ ln -s foo link
				$ hg add link
				$ hg ci -mbad link
				$ hg rm link
				$ hg ci -mok
				$ hg diff -g -r 0:1 > bad.patch

				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg import --no-commit bad.patch
				applying bad.patch

				$ hg status
				R link
				? bad.patch