upstream/mercurial-mirror Files · tests/test-diff-subdir.t

tests: make test-hup more race-proof...

tests: make test-hup more race-proof We need to wait until a journal exists AND is non-empty before aborting a transaction to get stable output. We move the kill wait outside the fifo block to avoid potential deadlock.

Adrian Buehlmann - - Load All Authors

File last commit:

r12140:552ea44c default


                r16342:7e24d348

stable

Download file

             test-diff-subdir.t
        
                    46 lines
            
             | 665 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-subdir.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-subdir

              r12140
            
        $ hg init

        $ mkdir alpha

        $ touch alpha/one

        $ mkdir beta

        $ touch beta/two

        $ hg add alpha/one beta/two

        $ hg ci -m "start"

        $ echo 1 > alpha/one

        $ echo 2 > beta/two

      everything

        $ hg diff --nodates

        diff -r 7d5ef1aea329 alpha/one

        --- a/alpha/one

        +++ b/alpha/one

        @@ -0,0 +1,1 @@

        +1

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      beta only

        $ hg diff --nodates beta

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      inside beta

        $ cd beta

        $ hg diff --nodates .

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

	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

Adrian Buehlmann tests: unify test-diff-subdir	r12140	$ hg init

		$ mkdir alpha
		$ touch alpha/one
		$ mkdir beta
		$ touch beta/two

		$ hg add alpha/one beta/two
		$ hg ci -m "start"

		$ echo 1 > alpha/one
		$ echo 2 > beta/two

		everything

		$ hg diff --nodates
		diff -r 7d5ef1aea329 alpha/one
		--- a/alpha/one
		+++ b/alpha/one
		@@ -0,0 +1,1 @@
		+1
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2

		beta only

		$ hg diff --nodates beta
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2

		inside beta

		$ cd beta
		$ hg diff --nodates .
		diff -r 7d5ef1aea329 beta/two
		--- a/beta/two
		+++ b/beta/two
		@@ -0,0 +1,1 @@
		+2