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

policy: eliminate ".pure." from module name only if marked as dual...

policy: eliminate ".pure." from module name only if marked as dual So we can switch cext/pure modules to new layout one by one.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32207:65cd7e70

default

Download file

             test-merge8.t
        
                    29 lines
            
             | 684 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge8.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge8

              r11981
            
      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

        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

Pradeepkumar Gayam tests: unify test-merge8	r11981	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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..