upstream/mercurial-mirror Files · tests/test-1993.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-1993.t
        
                    48 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-1993.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ echo b > b

        $ hg ci -Am1

        adding b

        $ hg tag -r0 default

        warning: tag default conflicts with existing branch name

        $ hg log

        changeset:   2:30a83d1e4a1e

        tag:         tip

        user:        test

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

        summary:     Added tag default for changeset f7b1eb17ad24

        changeset:   1:925d80f479bb

        user:        test

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

        summary:     1

        changeset:   0:f7b1eb17ad24

        tag:         default

        user:        test

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

        summary:     0

        $ hg update 'tag(default)'

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

        $ hg parents

        changeset:   0:f7b1eb17ad24

        tag:         default

        user:        test

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

        summary:     0

        $ hg update 'branch(default)'

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

        $ hg parents

        changeset:   2:30a83d1e4a1e

        tag:         tip

        user:        test

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

        summary:     Added tag default for changeset f7b1eb17ad24

        $ 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

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Am0
				adding a
				$ echo b > b
				$ hg ci -Am1
				adding b
				$ hg tag -r0 default
				warning: tag default conflicts with existing branch name
				$ hg log
				changeset: 2:30a83d1e4a1e
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added tag default for changeset f7b1eb17ad24

				changeset: 1:925d80f479bb
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: 1

				changeset: 0:f7b1eb17ad24
				tag: default
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: 0

				$ hg update 'tag(default)'
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ hg parents
				changeset: 0:f7b1eb17ad24
				tag: default
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: 0

				$ hg update 'branch(default)'
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg parents
				changeset: 2:30a83d1e4a1e
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added tag default for changeset f7b1eb17ad24


				$ cd ..