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

run-tests: use regex when searching for $HGPORT in test output...

run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ...

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r12895:53cfde2b

stable

Download file

             test-update-renames.t
        
                    30 lines
            
             | 478 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 during merge.

        merging b failed!

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

        use 'hg resolve' to retry unresolved file merges

        [1]

        $ cd ..

	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 during merge.
				merging b failed!
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				$ cd ..