upstream/mercurial-mirror Files · tests/test-merge10.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".

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r28503:138ec883

default

Download file

             test-merge10.t
        
                    53 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge10.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
      Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb

      (merge correctly when all the files in a directory are moved

      but then local changes are added in the same directory)

        $ hg init a

        $ cd a

        $ mkdir -p testdir

        $ echo a > testdir/a

        $ hg add testdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m a

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo alpha > testdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m remote-change

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ cd ..

        $ cd b

        $ mkdir testdir/subdir

        $ hg mv testdir/a testdir/subdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m move

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ mkdir newdir

        $ echo beta > newdir/beta

        $ hg add newdir/beta

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m local-addition

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up -C 2

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

        $ hg merge

        merging testdir/subdir/a and testdir/a to testdir/subdir/a

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

        (branch merge, don't forget to commit)

        $ hg stat

        M testdir/subdir/a

        $ hg diff --nodates

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r bc21c9773bfa testdir/subdir/a

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        --- a/testdir/subdir/a

        +++ b/testdir/subdir/a

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

        -a

        +alpha

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Pradeepkumar Gayam tests: unify test-merge10	r11983	Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
		(merge correctly when all the files in a directory are moved
		but then local changes are added in the same directory)

		$ hg init a
		$ cd a
		$ mkdir -p testdir
		$ echo a > testdir/a
		$ hg add testdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m a
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ cd ..

		$ hg clone a b
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd a
		$ echo alpha > testdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m remote-change
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ cd ..

		$ cd b
		$ mkdir testdir/subdir
		$ hg mv testdir/a testdir/subdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m move
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ mkdir newdir
		$ echo beta > newdir/beta
		$ hg add newdir/beta
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m local-addition
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ hg pull ../a
		pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg up -C 2
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg merge
		merging testdir/subdir/a and testdir/a to testdir/subdir/a
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg stat
		M testdir/subdir/a
		$ hg diff --nodates
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r bc21c9773bfa testdir/subdir/a
Pradeepkumar Gayam tests: unify test-merge10	r11983	--- a/testdir/subdir/a
		+++ b/testdir/subdir/a
		@@ -1,1 +1,1 @@
		-a
		+alpha
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..