upstream/mercurial-mirror Files · tests/test-add.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.

Nicolas Dumazet - - Load All Authors

File last commit:

r11795:06793ad3 default


                r12156:4c94b6d0

default

Download file

             test-add.t
        
                    96 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-add.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add -n

        adding a

        $ hg st

        ? a

        $ hg add

        adding a

        $ hg st

        A a

        $ hg forget a

        $ hg add

        adding a

        $ hg st

        A a

        $ echo b > b

        $ hg add -n b

        $ hg st

        A a

        ? b

        $ hg add b || echo "failed to add b"

        $ hg st

        A a

        A b

      should fail

        $ hg add b

        b already tracked!

        $ hg st

        A a

        A b

        $ hg ci -m 0 --traceback

      should fail

        $ hg add a

        a already tracked!

        $ echo aa > a

        $ hg ci -m 1

        $ hg up 0

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

        $ echo aaa > a

        $ hg ci -m 2

        created new head

        $ hg merge

        merging a

        warning: conflicts during merge.

        merging a failed!

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

        $ hg st

        M a

        ? a.orig

      should fail

        $ hg add a

        a already tracked!

        $ hg st

        M a

        ? a.orig

        $ hg resolve -m a

        $ hg ci -m merge

      issue683

        $ hg forget a

        $ hg add a

        $ hg st

        ? a.orig

        $ hg rm a

        $ hg st

        R a

        ? a.orig

        $ echo a > a

        $ hg add a

        $ hg st

        M a

        ? a.orig

        $ hg add c && echo "unexpected addition of missing file"

        c: No such file or directory

        $ echo c > c

        $ hg add d c && echo "unexpected addition of missing file"

        d: No such file or directory

        $ hg st

        M a

        A c

        ? a.orig

	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

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg add -n
				adding a
				$ hg st
				? a
				$ hg add
				adding a
				$ hg st
				A a
				$ hg forget a
				$ hg add
				adding a
				$ hg st
				A a

				$ echo b > b
				$ hg add -n b
				$ hg st
				A a
				? b
				$ hg add b \|\| echo "failed to add b"
				$ hg st
				A a
				A b

				should fail

				$ hg add b
				b already tracked!
				$ hg st
				A a
				A b

				$ hg ci -m 0 --traceback

				should fail

				$ hg add a
				a already tracked!

				$ echo aa > a
				$ hg ci -m 1
				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo aaa > a
				$ hg ci -m 2
				created new head

				$ hg merge
				merging a
				warning: conflicts during merge.
				merging a failed!
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
				$ hg st
				M a
				? a.orig

				should fail

				$ hg add a
				a already tracked!
				$ hg st
				M a
				? a.orig
				$ hg resolve -m a
				$ hg ci -m merge

				issue683

				$ hg forget a
				$ hg add a
				$ hg st
				? a.orig
				$ hg rm a
				$ hg st
				R a
				? a.orig
				$ echo a > a
				$ hg add a
				$ hg st
				M a
				? a.orig

				$ hg add c && echo "unexpected addition of missing file"
				c: No such file or directory
				$ echo c > c
				$ hg add d c && echo "unexpected addition of missing file"
				d: No such file or directory
				$ hg st
				M a
				A c
				? a.orig