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

tests: replace `hg id --debug -i` command substitution with non-debug command...

tests: replace `hg id --debug -i` command substitution with non-debug command The censor and convert tests were failing on Windows because the `--debug` flag also prints debug messages, and at least some of these were outputting: skip updating dirstate: identity mismatch ${node} Obviously that causes cascading problems. The other tests were OK, but it's better to use a non debug command for stability.

Martin von Zweigbergk - - Load All Authors

File last commit:

r46431:8d72e29a default


                r52837:2eeca9a8

default

Download file

             test-merge2.t
        
                    57 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init t

        $ cd t

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg add b

        $ hg commit -m "commit #2"

        created new head

        $ cd ..; rm -r t

        $ mkdir t

        $ cd t

        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg commit -A -m "commit #2"

        adding b

        created new head

        $ cd ..; rm -r t

        $ hg init t

        $ cd t

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg remove b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg commit -A -m "commit #2"

        adding b

        created new head

        $ hg merge 'wdir()'

        abort: merging with the working copy has no effect

        [10]

        $ 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

				$ hg init t
				$ cd t
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg add b
				$ hg commit -m "commit #2"
				created new head
				$ cd ..; rm -r t

				$ mkdir t
				$ cd t
				$ hg init
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg commit -A -m "commit #2"
				adding b
				created new head
				$ cd ..; rm -r t

				$ hg init t
				$ cd t
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg remove b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg commit -A -m "commit #2"
				adding b
				created new head

				$ hg merge 'wdir()'
				abort: merging with the working copy has no effect
				[10]

				$ cd ..