upstream/mercurial-mirror Files · tests/test-merge8.t

tests: remove test-pull-pull-corruption2.t...

tests: remove test-pull-pull-corruption2.t This test gave random failures on slow machines (solaris). The test was added in as a test case from issue148. It did however require manual setup: The attached script creates such a corruption (you have to add a "import time; time.spleep(3)" in localrepo.addchangegroup before the changegroup manifest are written for example. The test as it is has thus no value as automatic test case. The necessary sleep could be added by a hook, but test-pending.t already tests that.

Pradeepkumar Gayam - - Load All Authors

File last commit:

r11981:518b90d6 default


                r16482:a5d359b3

stable

Download file

             test-merge8.t
        
                    27 lines
            
             | 673 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge8.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test for changeset ba7c74081861

      (update dirstate correctly for non-branchmerge updates)

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add a

        $ hg commit -m a

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ hg mv a b

        $ hg commit -m move

        $ echo b >> b

        $ hg commit -m b

        $ cd ../b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 1 files

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

        $ hg update

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

	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

				Test for changeset ba7c74081861
				(update dirstate correctly for non-branchmerge updates)
				$ hg init a
				$ cd a
				$ echo a > a
				$ hg add a
				$ hg commit -m a
				$ cd ..
				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd a
				$ hg mv a b
				$ hg commit -m move
				$ echo b >> b
				$ hg commit -m b
				$ cd ../b
				$ hg pull ../a
				pulling from ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg update
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved