upstream/mercurial-mirror Files · tests/test-unrelated-pull.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-unrelated-pull.t
        
                    45 lines
            
             | 870 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unrelated-pull.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init a

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd a

        $ echo 123 > a

        $ hg add a

        $ hg commit -m "a" -u a

        $ cd ..

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init b

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd b

        $ echo 321 > b

        $ hg add b

        $ hg commit -m "b" -u b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        abort: repository is unrelated

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg pull -f ../a

        pulling from ../a

        searching for changes

        warning: repository is unrelated

        Peter Arrenbrecht
    
discovery: avoid discovery when local graph is a subset of remote...

              r13742
            
        requesting all changes

        Adrian Buehlmann
    
combine tests

              r12279
            
        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 heads

        changeset:   1:9a79c33a9db3

        tag:         tip

        parent:      -1:000000000000

        user:        a

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     a

        changeset:   0:01f8062b2de5

        user:        b

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     b

        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

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init a
Adrian Buehlmann combine tests	r12279	$ cd a
		$ echo 123 > a
		$ hg add a
		$ hg commit -m "a" -u a

		$ cd ..
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init b
Adrian Buehlmann combine tests	r12279	$ cd b
		$ echo 321 > b
		$ hg add b
		$ hg commit -m "b" -u b

		$ hg pull ../a
		pulling from ../a
		searching for changes
		abort: repository is unrelated
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279
		$ hg pull -f ../a
		pulling from ../a
		searching for changes
		warning: repository is unrelated
Peter Arrenbrecht discovery: avoid discovery when local graph is a subset of remote...	r13742	requesting all changes
Adrian Buehlmann combine tests	r12279	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 heads
		changeset: 1:9a79c33a9db3
		tag: tip
		parent: -1:000000000000
		user: a
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a

		changeset: 0:01f8062b2de5
		user: b
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

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