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

r15615:41885892 stable


                r23525:5126d771

default

Download file

             test-issue842.t
        
                    39 lines
            
             | 734 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue842.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue842

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ echo foo > a

        $ hg ci -Ama

        adding a

        $ hg up -r0000

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

        $ echo bar > a

      Should issue new head warning:

        $ hg ci -Amb

        adding a

        created new head

        $ hg up -r0000

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

        $ echo stuffy > a

      Should not issue new head warning:

        $ hg ci -q -Amc

        $ hg up -r0000

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

        $ echo crap > a

        $ hg branch testing

        marked working directory as branch testing

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Should not issue warning:

        $ hg ci -q -Amd

	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: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue842
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ echo foo > a
		$ hg ci -Ama
		adding a

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

		$ echo bar > a

		Should issue new head warning:

		$ hg ci -Amb
		adding a
		created new head

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

		$ echo stuffy > a

		Should not issue new head warning:

		$ hg ci -q -Amc

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

		$ echo crap > a
		$ hg branch testing
		marked working directory as branch testing
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-issue*	r12195
		Should not issue warning:

		$ hg ci -q -Amd