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

histedit: make verification configurable...

histedit: make verification configurable Before we can add a 'base' action to histedit need to change verification so that action can specify which steps of verification should run for it. Also it's everything we need for the exec and stop actions implementation. I thought about baking verification into each histedit action (so each of them is responsible for verifying its constraints) but it felt wrong because: - every action would need to know its context (eg. the list of all other actions) - a lot of duplicated work will be added - each action will iterate through all others - the steps of the verification would need to be extracted and named anyway in order to be reused The verifyrules function grows too big now. I plan to refator it in one of the next series.

Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default


                r27082:4898e442

default

Download file

             test-update-renames.t
        
                    26 lines
            
             | 486 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

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

              r26614
            
        warning: conflicts while merging b! (edit, 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
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging b! (edit, 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]