upstream/mercurial-mirror Files · tests/test-pull-permission.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-pull-permission.t
        
                    32 lines
            
             | 625 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-permission.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: change some #ifs to #requires

              r22047
            
      #require unix-permissions no-root

        Mads Kiilerich
    
tests: add missing 'hghave unix-permissions'

              r15516
            
        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init a

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd a

        $ echo foo > b

        $ hg add b

        $ hg ci -m "b"

        $ chmod -w .hg/store

        $ cd ..

        $ hg clone a b

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

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

        $ chmod +w a/.hg/store # let test clean up

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        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

Matt Mackall tests: change some #ifs to #requires	r22047	#require unix-permissions no-root
Mads Kiilerich tests: add missing 'hghave unix-permissions'	r15516
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init a
Adrian Buehlmann combine tests	r12279	$ cd a
		$ echo foo > b
		$ hg add b
		$ hg ci -m "b"

		$ chmod -w .hg/store

		$ cd ..

		$ hg clone a b
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ chmod +w a/.hg/store # let test clean up

		$ cd b
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

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