upstream/mercurial-mirror Files · tests/test-update-renames.t

error: get Abort from 'error' instead of 'util'...

error: get Abort from 'error' instead of 'util' The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be confused about that and gives all the credit to 'util' instead of the hardworking 'error'. In a spirit of equity, we break the cycle of injustice and give back to 'error' the respect it deserves. And screw that 'util' poser. For great justice.

Mads Kiilerich - - Load All Authors

File last commit:

r16911:39d38f16 default


                r26587:56b2bcea

default

Download file

             test-update-renames.t
        
                    27 lines
            
             | 517 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-renames.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r12328
            
      Test update logic when there are renames

        Adrian Buehlmann
    
tests: unify test-update-renames

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

              r12328
            
      Update with local changes across a file rename

        Adrian Buehlmann
    
tests: unify test-update-renames

              r12299
            
        $ hg init

        $ echo a > a

        $ hg add a

        $ hg ci -m a

        $ hg mv a b

        $ hg ci -m rename

        $ echo b > b

        $ hg ci -m change

        $ hg up -q 0

        $ echo c > a

        $ hg up

        merging a and b to b

        warning: conflicts during merge.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

              r15501
            
        merging b incomplete! (edit conflicts, then use 'hg resolve --mark')

        Adrian Buehlmann
    
tests: unify test-update-renames

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

        use 'hg resolve' to retry unresolved file merges

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

	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	Test update logic when there are renames
Adrian Buehlmann tests: unify test-update-renames	r12299
Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	Update with local changes across a file rename
Adrian Buehlmann tests: unify test-update-renames	r12299
		$ hg init

		$ echo a > a
		$ hg add a
		$ hg ci -m a

		$ hg mv a b
		$ hg ci -m rename

		$ echo b > b
		$ hg ci -m change

		$ hg up -q 0

		$ echo c > a

		$ hg up
		merging a and b to b
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
Adrian Buehlmann tests: unify test-update-renames	r12299	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
Matt Mackall tests: add exit codes to unified tests	r12316	[1]