upstream/mercurial-mirror Files · tests/test-branch-tag-confict.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-branch-tag-confict.t
        
                    65 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-branch-tag-confict.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Initial setup.

        $ hg init repo

        $ cd repo

        $ touch thefile

        $ hg ci -A -m 'Initial commit.'

        adding thefile

      Create a tag.

        $ hg tag branchortag

      Create a branch with the same name as the tag.

        $ hg branch branchortag

        marked working directory as branch branchortag

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

        $ hg ci -m 'Create a branch with the same name as a tag.'

      This is what we have:

        $ hg log

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

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

        summary:     Create a branch with the same name as a tag.

        changeset:   1:2635c45ca99b

        user:        test

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

        summary:     Added tag branchortag for changeset f57387372b5d

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

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

        summary:     Initial commit.

      Update to the tag:

        $ hg up 'tag(branchortag)'

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

        $ hg parents

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

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

        summary:     Initial commit.

      Updating to the branch:

        $ hg up 'branch(branchortag)'

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

        $ hg parents

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

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

        summary:     Create a branch with the same name as a tag.

        $ 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

				Initial setup.

				$ hg init repo
				$ cd repo
				$ touch thefile
				$ hg ci -A -m 'Initial commit.'
				adding thefile

				Create a tag.

				$ hg tag branchortag

				Create a branch with the same name as the tag.

				$ hg branch branchortag
				marked working directory as branch branchortag
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -m 'Create a branch with the same name as a tag.'

				This is what we have:

				$ hg log
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.

				changeset: 1:2635c45ca99b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added tag branchortag for changeset f57387372b5d

				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Update to the tag:

				$ hg up 'tag(branchortag)'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg parents
				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Updating to the branch:

				$ hg up 'branch(branchortag)'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg parents
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.


				$ cd ..