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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Mads Kiilerich - - Load All Authors

File last commit:

r16911:39d38f16 default


                r23524:a1a7c94d

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]