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

hg: acquire wlock while updating the working directory via updatetotally...

hg: acquire wlock while updating the working directory via updatetotally updatetotally() might be invoked outside wlock scope (e.g. invocation via postincoming() at "hg unbundle" or "hg pull"). In such case, acquisition of wlock is needed for consistent view, because parallel "hg update" and/or "hg bookmarks" might change working directory status while executing updatetotally(). Strictly speaking, truly consistent updating should acquire also store lock, because active bookmark might be moved to another one outside wlock scope (e.g. pulling from other repository causes updating current active one). Acquisition of wlock in this patch ensures consistency in as same level as past "hg update".

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r28503:138ec883

default

Download file

             test-issue619.t
        
                    36 lines
            
             | 749 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue619.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/619

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ echo b > b

        $ hg branch b

        marked working directory as branch b

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Amb

        adding b

        $ hg co -C 0

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

      Fast-forward:

        $ hg merge b

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

        (branch merge, don't forget to commit)

        $ hg ci -Ammerge

      Bogus fast-forward should fail:

        $ hg merge b

        abort: merging with a working directory ancestor has no effect

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        Pierre-Yves David
    
revset: fix first and last for generatorset (issue4465)...

              r23413
            
      Even with strange revset (issue4465)

        $ hg merge ::.

        abort: merging with a working directory ancestor has no effect

        [255]

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/619
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ echo a > a
		$ hg ci -Ama
		adding a

		$ echo b > b
		$ hg branch b
		marked working directory as branch b
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-issue*	r12195	$ hg ci -Amb
		adding b

		$ hg co -C 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		Fast-forward:

		$ hg merge b
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -Ammerge

		Bogus fast-forward should fail:

		$ hg merge b
		abort: merging with a working directory ancestor has no effect
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-issue*	r12195
Pierre-Yves David revset: fix first and last for generatorset (issue4465)...	r23413	Even with strange revset (issue4465)

		$ hg merge ::.
		abort: merging with a working directory ancestor has no effect
		[255]