upstream/mercurial-mirror Files · tests/test-merge8.t

tests: remove unneeded -d flags...

tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

Pradeepkumar Gayam - - Load All Authors

File last commit:

r11981:518b90d6 default


                r12156:4c94b6d0

default

Download file

             test-merge8.t
        
                    27 lines
            
             | 673 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge8.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge8

              r11981
            
      Test for changeset ba7c74081861

      (update dirstate correctly for non-branchmerge updates)

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add a

        $ hg commit -m a

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ hg mv a b

        $ hg commit -m move

        $ echo b >> b

        $ hg commit -m b

        $ cd ../b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg update

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

	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

Pradeepkumar Gayam tests: unify test-merge8	r11981	Test for changeset ba7c74081861
		(update dirstate correctly for non-branchmerge updates)
		$ hg init a
		$ cd a
		$ echo a > a
		$ hg add a
		$ hg commit -m a
		$ cd ..
		$ hg clone a b
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd a
		$ hg mv a b
		$ hg commit -m move
		$ echo b >> b
		$ hg commit -m b
		$ cd ../b
		$ hg pull ../a
		pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		(run 'hg update' to get a working copy)
		$ hg update
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved