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

status: add support for log-like template keywords and functions...

status: add support for log-like template keywords and functions It's bound to ctx2 since "hg status" can be considered to show the status of the files at ctx2 given ctx1 as the base.

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r38563:85e3aa21

@67 default

Download file

             test-merge8.t
        
                    30 lines
            
             | 727 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

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets e3c9b40284e1:772b37f1ca37

        Pradeepkumar Gayam
    
tests: unify test-merge8

              r11981
            
        (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
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets e3c9b40284e1:772b37f1ca37
Pradeepkumar Gayam tests: unify test-merge8	r11981	(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 ..