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

FUJIWARA Katsunori - - Load All Authors

File last commit:

r21918:10abc3a5 default


                r22285:85bded43

default

Download file

             test-basic.t
        
                    65 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-basic.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Create a repository:

        $ hg config

        defaults.backout=-d "0 0"

        defaults.commit=-d "0 0"

        defaults.shelve=--date "0 0"

        defaults.tag=-d "0 0"

        ui.slash=True

        ui.interactive=False

        ui.mergemarkers=detailed

        $ hg init t

        $ cd t

      Make a changeset:

        $ echo a > a

        $ hg add a

        $ hg commit -m test

      This command is ancient:

        $ hg history

        changeset:   0:acb14030fe0a

        tag:         tip

        user:        test

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

        summary:     test

      Verify that updating to revision 0 via commands.update() works properly

        $ cat <<EOF > update_to_rev0.py

        > from mercurial import ui, hg, commands

        > myui = ui.ui()

        > repo = hg.repository(myui, path='.')

        > commands.update(myui, repo, rev=0)

        > EOF

        $ hg up null

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

        $ python ./update_to_rev0.py

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

        $ hg identify -n

        0

      Poke around at hashes:

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        $ hg cat a

        a

      Verify should succeed:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

      At the end...

        $ 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

				Create a repository:

				$ hg config
				defaults.backout=-d "0 0"
				defaults.commit=-d "0 0"
				defaults.shelve=--date "0 0"
				defaults.tag=-d "0 0"
				ui.slash=True
				ui.interactive=False
				ui.mergemarkers=detailed
				$ hg init t
				$ cd t

				Make a changeset:

				$ echo a > a
				$ hg add a
				$ hg commit -m test

				This command is ancient:

				$ hg history
				changeset: 0:acb14030fe0a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: test


				Verify that updating to revision 0 via commands.update() works properly

				$ cat <<EOF > update_to_rev0.py
				> from mercurial import ui, hg, commands
				> myui = ui.ui()
				> repo = hg.repository(myui, path='.')
				> commands.update(myui, repo, rev=0)
				> EOF
				$ hg up null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ python ./update_to_rev0.py
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg identify -n
				0


				Poke around at hashes:

				$ hg manifest --debug
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a

				$ hg cat a
				a

				Verify should succeed:

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

				At the end...

				$ cd ..