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

tests: fix builtin module test on pypy...

tests: fix builtin module test on pypy On pypy datetime and cProfile are modules written in Python, not in C. For the purpose of this test, just list them explicitely as builtins, which silences warnings about them being imported before stdlib modules.

Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default


                r28713:806d260c

default

Download file

             test-update-renames.t
        
                    26 lines
            
             | 486 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-renames.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test update logic when there are renames

      Update with local changes across a file rename

        $ 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 while merging b! (edit, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges

        [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

				Test update logic when there are renames

				Update with local changes across a file rename

				$ 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 while merging b! (edit, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]