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

pull: return 1 when no changes found (BC)...

pull: return 1 when no changes found (BC) Currently we have the following return codes if nothing is found: commit incoming outgoing pull push intended 1 1 1 1 1 documented 1 1 1 0 1 actual 1 1 1 0 1 This makes pull agree with the rest of the table and makes it easy to detect "nothing was pulled" in scripts.

Matt Mackall - - Load All Authors

File last commit:

r15524:e7119b09 default


                r16039:093b75c7

stable

Download file

             test-add.t
        
                    136 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-add.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
tests: use 'hghave no-windows' to avoid testing reserved file names on windows

              r15444
            
        $ "$TESTDIR/hghave" no-windows || exit 80

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ 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

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        $ hg add b

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ hg st

        A a

        A b

      should fail

        $ hg add b

        b already tracked!

        $ hg st

        A a

        A b

        Adrian Buehlmann
    
add: introduce a warning message for non-portable filenames (issue2756) (BC)...

              r13962
            
        $ echo foo > con.xml

        $ hg --config ui.portablefilenames=jump add con.xml

        abort: ui.portablefilenames value is invalid ('jump')

        [255]

        $ hg --config ui.portablefilenames=abort add con.xml

        abort: filename contains 'con', which is reserved on Windows: 'con.xml'

        [255]

        $ hg st

        A a

        A b

        ? con.xml

        $ hg add con.xml

        warning: filename contains 'con', which is reserved on Windows: 'con.xml'

        $ hg st

        A a

        A b

        A con.xml

        $ echo bla > 'hello:world'

        $ hg --config ui.portablefilenames=abort add

        adding hello:world

        abort: filename contains ':', which is reserved on Windows: 'hello:world'

        [255]

        $ hg st

        A a

        A b

        A con.xml

        ? hello:world

        $ hg --config ui.portablefilenames=ignore add

        adding hello:world

        $ hg st

        A a

        A b

        A con.xml

        A hello:world

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ 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.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

              r15501
            
        merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

        Nicolas Dumazet
    
tests: unify test-add

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

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

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

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ 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

        Martin Geisler
    
tests: added a short description to issue numbers...

              r12399
            
      Issue683: peculiarity with hg revert of an removed then added file

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ 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"

        Mads Kiilerich
    
tests: hide 'No such file or directory' messages...

              r15521
            
        c: * (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ echo c > c

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

        Mads Kiilerich
    
tests: hide 'No such file or directory' messages...

              r15521
            
        d: * (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-add

              r11795
            
        $ 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

Mads Kiilerich tests: use 'hghave no-windows' to avoid testing reserved file names on windows	r15444	$ "$TESTDIR/hghave" no-windows \|\| exit 80

Nicolas Dumazet tests: unify test-add	r11795	$ 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
Matt Mackall tests: cleanup exit code handling in unified tests	r12365	$ hg add b
Nicolas Dumazet tests: unify test-add	r11795	$ hg st
		A a
		A b

		should fail

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

Adrian Buehlmann add: introduce a warning message for non-portable filenames (issue2756) (BC)...	r13962	$ echo foo > con.xml
		$ hg --config ui.portablefilenames=jump add con.xml
		abort: ui.portablefilenames value is invalid ('jump')
		[255]
		$ hg --config ui.portablefilenames=abort add con.xml
		abort: filename contains 'con', which is reserved on Windows: 'con.xml'
		[255]
		$ hg st
		A a
		A b
		? con.xml
		$ hg add con.xml
		warning: filename contains 'con', which is reserved on Windows: 'con.xml'
		$ hg st
		A a
		A b
		A con.xml
		$ echo bla > 'hello:world'
		$ hg --config ui.portablefilenames=abort add
		adding hello:world
		abort: filename contains ':', which is reserved on Windows: 'hello:world'
		[255]
		$ hg st
		A a
		A b
		A con.xml
		? hello:world
		$ hg --config ui.portablefilenames=ignore add
		adding hello:world
		$ hg st
		A a
		A b
		A con.xml
		A hello:world

Nicolas Dumazet tests: unify test-add	r11795	$ 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.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
Nicolas Dumazet tests: unify test-add	r11795	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-add	r11795	$ 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

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue683: peculiarity with hg revert of an removed then added file
Nicolas Dumazet tests: unify test-add	r11795
		$ 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"
Mads Kiilerich tests: hide 'No such file or directory' messages...	r15521	c: * (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-add	r11795	$ echo c > c
		$ hg add d c && echo "unexpected addition of missing file"
Mads Kiilerich tests: hide 'No such file or directory' messages...	r15521	d: * (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-add	r11795	$ hg st
		M a
		A c
		? a.orig