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

Pierre-Yves David - - Load All Authors

File last commit:

r23413:0c432696 stable


                r23525:5126d771

default

Download file

             test-issue619.t
        
                    36 lines
            
             | 758 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue619.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/issue619

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ echo b > b

        $ hg branch b

        marked working directory as branch b

        Matt Mackall
    
branch: warn on branching

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

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Amb

        adding b

        $ hg co -C 0

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

      Fast-forward:

        $ hg merge b

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

        (branch merge, don't forget to commit)

        $ hg ci -Ammerge

      Bogus fast-forward should fail:

        $ hg merge b

        abort: merging with a working directory ancestor has no effect

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        Pierre-Yves David
    
revset: fix first and last for generatorset (issue4465)...

              r23413
            
      Even with strange revset (issue4465)

        $ hg merge ::.

        abort: merging with a working directory ancestor has no effect

        [255]

	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/issue619
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ echo a > a
		$ hg ci -Ama
		adding a

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

		$ hg co -C 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		Fast-forward:

		$ hg merge b
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -Ammerge

		Bogus fast-forward should fail:

		$ hg merge b
		abort: merging with a working directory ancestor has no effect
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
Pierre-Yves David revset: fix first and last for generatorset (issue4465)...	r23413	Even with strange revset (issue4465)

		$ hg merge ::.
		abort: merging with a working directory ancestor has no effect
		[255]