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

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23525:5126d771

default

Download file

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

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Adrian Buehlmann
    
tests: unify test-issue1438 and test-issue2137

              r12204
            
        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      http://mercurial.selenic.com/bts/issue1438

        Adrian Buehlmann
    
tests: unify test-issue1438 and test-issue2137

              r12204
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require symlink
Adrian Buehlmann tests: unify test-issue1438 and test-issue2137	r12204
Matt Mackall tests: replace exit 80 with #require	r22046	http://mercurial.selenic.com/bts/issue1438
Adrian Buehlmann tests: unify test-issue1438 and test-issue2137	r12204
		$ 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