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

FUJIWARA Katsunori - - Load All Authors

File last commit:

r21918:10abc3a5 default


                r22284:72b37865

default

Download file

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

        Matt Mackall
    
tests: unify test-basic

              r11742
            
      Create a repository:

        Matt Mackall
    
config: make repo optional again

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

        FUJIWARA Katsunori
    
filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety...

              r21918
            
        ui.mergemarkers=detailed

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init t

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        $ cd t

      Make a changeset:

        $ echo a > a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m test

        Matt Mackall
    
tests: unify test-basic

              r11742
            
      This command is ancient:

        $ hg history

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        changeset:   0:acb14030fe0a

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        tag:         tip

        user:        test

        Martin Geisler
    
tests: remove unneeded -d flags...

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

        Matt Mackall
    
tests: unify test-basic

              r11742
            
        summary:     test

        Mark Drago
    
commands.update() now works properly with a revision of 0...

              r13568
            
      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

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on empty lines...

              r17346
            
        Mark Drago
    
commands.update() now works properly with a revision of 0...

              r13568
            
        Matt Mackall
    
tests: unify test-basic

              r11742
            
      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...

        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

Matt Mackall tests: unify test-basic	r11742	Create a repository:

Matt Mackall config: make repo optional again	r20608	$ 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
FUJIWARA Katsunori filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety...	r21918	ui.mergemarkers=detailed
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init t
Matt Mackall tests: unify test-basic	r11742	$ cd t

		Make a changeset:

		$ echo a > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m test
Matt Mackall tests: unify test-basic	r11742
		This command is ancient:

		$ hg history
Martin Geisler tests: remove unneeded -d flags...	r12156	changeset: 0:acb14030fe0a
Matt Mackall tests: unify test-basic	r11742	tag: tip
		user: test
Martin Geisler tests: remove unneeded -d flags...	r12156	date: Thu Jan 01 00:00:00 1970 +0000
Matt Mackall tests: unify test-basic	r11742	summary: test


Mark Drago commands.update() now works properly with a revision of 0...	r13568	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
Mads Kiilerich check-code: fix check for trailing whitespace on empty lines...	r17346
Mark Drago commands.update() now works properly with a revision of 0...	r13568
Matt Mackall tests: unify test-basic	r11742	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...
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..