upstream/mercurial-mirror Files · tests/test-simple-update.t

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22286:3f3b9483

default

Download file

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

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init test

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ 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

        Idan Kamara
    
update: fix check for no rev when a date is given...

              r13960
            
      update to rev 0 with a date

        $ hg upd -d foo 0

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

        [255]

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init test
Adrian Buehlmann combine tests	r12279	$ 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

Idan Kamara update: fix check for no rev when a date is given...	r13960	update to rev 0 with a date

		$ hg upd -d foo 0
		abort: you can't specify a revision and a date
		[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..