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

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r22285:85bded43

default

Download file

             test-issue1306.t
        
                    96 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1306.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue1306

      Initialize remote repo with branches:

        $ hg init remote

        $ cd remote

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg branch br

        marked working directory as branch br

        (branches are permanent and global, did you want a bookmark?)

        $ hg ci -Amb

        $ echo c > c

        $ hg ci -Amc

        adding c

        $ hg log

        changeset:   2:ae3d9c30ec50

        branch:      br

        tag:         tip

        user:        test

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

        summary:     c

        changeset:   1:3f7f930ca414

        branch:      br

        user:        test

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

        summary:     b

        changeset:   0:cb9a9f314b8b

        user:        test

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

        summary:     a

        $ cd ..

      Try cloning -r branch:

        $ hg clone -rbr remote local1

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch br

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

        $ hg -R local1 parents

        changeset:   2:ae3d9c30ec50

        branch:      br

        tag:         tip

        user:        test

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

        summary:     c

      Try cloning -rother clone#branch:

        $ hg clone -r0 remote#br local2

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch default

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

        $ hg -R local2 parents

        changeset:   0:cb9a9f314b8b

        user:        test

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

        summary:     a

      Try cloning -r1 clone#branch:

        $ hg clone -r1 remote#br local3

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch br

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

        $ hg -R local3 parents

        changeset:   1:3f7f930ca414

        branch:      br

        user:        test

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

        summary:     b

	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

				http://mercurial.selenic.com/bts/issue1306

				Initialize remote repo with branches:

				$ hg init remote
				$ cd remote

				$ echo a > a
				$ hg ci -Ama
				adding a

				$ hg branch br
				marked working directory as branch br
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -Amb

				$ echo c > c
				$ hg ci -Amc
				adding c

				$ hg log
				changeset: 2:ae3d9c30ec50
				branch: br
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: c

				changeset: 1:3f7f930ca414
				branch: br
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: b

				changeset: 0:cb9a9f314b8b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: a


				$ cd ..

				Try cloning -r branch:

				$ hg clone -rbr remote local1
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 2 changes to 2 files
				updating to branch br
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg -R local1 parents
				changeset: 2:ae3d9c30ec50
				branch: br
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: c


				Try cloning -rother clone#branch:

				$ hg clone -r0 remote#br local2
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 2 changes to 2 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg -R local2 parents
				changeset: 0:cb9a9f314b8b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: a


				Try cloning -r1 clone#branch:

				$ hg clone -r1 remote#br local3
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 2 changes to 2 files
				updating to branch br
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg -R local3 parents
				changeset: 1:3f7f930ca414
				branch: br
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: b