upstream/mercurial-mirror Files · tests/test-lock-badness.t

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r22284:72b37865

default

Download file

             test-lock-badness.t
        
                    41 lines
            
             | 1011 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-lock-badness.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require unix-permissions no-root no-windows

      Prepare

        $ hg init a

        $ echo a > a/a

        $ hg -R a ci -A -m a

        adding a

        $ hg clone a b

        updating to branch default

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

      One process waiting for another

        $ cat > hooks.py << EOF

        > import time

        > def sleepone(**x): time.sleep(1)

        > def sleephalf(**x): time.sleep(0.5)

        > EOF

        $ echo b > b/b

        $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &

        $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"

        waiting for lock on working directory of b held by '*:*' (glob)

        got lock after ? seconds (glob)

        warning: ignoring unknown working parent d2ae7f538514!

        $ wait

        $ cat stdout

        adding b

      Pushing to a local read-only repo that can't be locked

        $ chmod 100 a/.hg/store

        $ hg -R b push a

        pushing to a

        searching for changes

        abort: could not lock repository a: Permission denied

        [255]

        $ chmod 700 a/.hg/store

	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

				#require unix-permissions no-root no-windows

				Prepare

				$ hg init a
				$ echo a > a/a
				$ hg -R a ci -A -m a
				adding a

				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				One process waiting for another

				$ cat > hooks.py << EOF
				> import time
				> def sleepone(**x): time.sleep(1)
				> def sleephalf(**x): time.sleep(0.5)
				> EOF
				$ echo b > b/b
				$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
				$ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
				waiting for lock on working directory of b held by ':' (glob)
				got lock after ? seconds (glob)
				warning: ignoring unknown working parent d2ae7f538514!
				$ wait
				$ cat stdout
				adding b

				Pushing to a local read-only repo that can't be locked

				$ chmod 100 a/.hg/store

				$ hg -R b push a
				pushing to a
				searching for changes
				abort: could not lock repository a: Permission denied
				[255]

				$ chmod 700 a/.hg/store