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

r15615:41885892 stable


                r22284:72b37865

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