upstream/mercurial-mirror Files · tests/test-dirstate-race.t

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Adrian Buehlmann - - Load All Authors

File last commit:

r12279:28e2e380 default


                r27025:ec372573

default

Download file

             test-dirstate-race.t
        
                    33 lines
            
             | 353 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dirstate-race.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg add a

        $ hg commit -m test

      Do we ever miss a sub-second change?:

        $ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do

        >     hg co -qC 0

        >     echo b > a

        >     hg st

        > done

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

        M a

	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
				$ echo a > a
				$ hg add a
				$ hg commit -m test

				Do we ever miss a sub-second change?:

				$ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
				> hg co -qC 0
				> echo b > a
				> hg st
				> done
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a
				M a