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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22284:72b37865

default

Download file

             test-simple-update.t
        
                    58 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-simple-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init test

        $ cd test

        $ echo foo>foo

        $ hg addremove

        adding foo

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg clone . ../branch

        updating to branch default

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

        $ cd ../branch

        $ hg co

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

        $ echo bar>>foo

        $ hg commit -m "2"

        $ cd ../test

        $ hg pull ../branch

        pulling from ../branch

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ hg co

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

        $ cat foo

        foo

        bar

        $ hg manifest --debug

        6f4310b00b9a147241b071a60c28a650827fb03d 644   foo

      update to rev 0 with a date

        $ hg upd -d foo 0

        abort: you can't specify a revision and a date

        [255]

        $ 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 test
				$ cd test
				$ echo foo>foo
				$ hg addremove
				adding foo
				$ hg commit -m "1"

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg clone . ../branch
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ../branch
				$ hg co
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo bar>>foo
				$ hg commit -m "2"

				$ cd ../test

				$ hg pull ../branch
				pulling from ../branch
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 2 changesets, 2 total revisions

				$ hg co
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat foo
				foo
				bar

				$ hg manifest --debug
				6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

				update to rev 0 with a date

				$ hg upd -d foo 0
				abort: you can't specify a revision and a date
				[255]

				$ cd ..