upstream/mercurial-mirror Files · tests/test-pull-update.t

filemerge: add a 'leave unresolved' option to regular prompts...

filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.

liscju - - Load All Authors

File last commit:

r26968:216cc65c default


                r27162:4ab69be0

default

Download file

             test-pull-update.t
        
                    66 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-update.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init t

        $ cd t

        $ echo 1 > foo

        $ hg ci -Am m

        adding foo

        $ cd ..

        $ hg clone t tt

        updating to branch default

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

        $ cd tt

        $ echo 1.1 > foo

        $ hg ci -Am m

        $ cd ../t

        $ echo 1.2 > foo

        $ hg ci -Am m

      Should not update:

        $ hg pull -u ../tt

        pulling from ../tt

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        liscju
    
pull: return 255 value on update failure (issue4948) (BC)...

              r26968
            
        abort: not updating: not a linear update

        Siddharth Agarwal
    
update: improve error message for clean non-linear update

              r19798
            
        (merge or update --check to force update)

        liscju
    
pull: return 255 value on update failure (issue4948) (BC)...

              r26968
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd ../tt

      Should not update:

        $ hg pull -u ../t

        pulling from ../t

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        liscju
    
pull: return 255 value on update failure (issue4948) (BC)...

              r26968
            
        abort: not updating: not a linear update

        Siddharth Agarwal
    
update: improve error message for clean non-linear update

              r19798
            
        (merge or update --check to force update)

        liscju
    
pull: return 255 value on update failure (issue4948) (BC)...

              r26968
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ HGMERGE=true hg merge

        merging foo

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

        (branch merge, don't forget to commit)

        $ hg ci -mm

        $ cd ../t

      Should work:

        $ hg pull -u ../tt

        pulling from ../tt

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (-1 heads)

        1 files updated, 0 files merged, 0 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

Adrian Buehlmann combine tests	r12279	$ hg init t
		$ cd t
		$ echo 1 > foo
		$ hg ci -Am m
		adding foo

		$ cd ..
		$ hg clone t tt
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd tt
		$ echo 1.1 > foo
		$ hg ci -Am m

		$ cd ../t
		$ echo 1.2 > foo
		$ hg ci -Am m

		Should not update:

		$ hg pull -u ../tt
		pulling from ../tt
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
liscju pull: return 255 value on update failure (issue4948) (BC)...	r26968	abort: not updating: not a linear update
Siddharth Agarwal update: improve error message for clean non-linear update	r19798	(merge or update --check to force update)
liscju pull: return 255 value on update failure (issue4948) (BC)...	r26968	[255]
Adrian Buehlmann combine tests	r12279
		$ cd ../tt

		Should not update:

		$ hg pull -u ../t
		pulling from ../t
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
liscju pull: return 255 value on update failure (issue4948) (BC)...	r26968	abort: not updating: not a linear update
Siddharth Agarwal update: improve error message for clean non-linear update	r19798	(merge or update --check to force update)
liscju pull: return 255 value on update failure (issue4948) (BC)...	r26968	[255]
Adrian Buehlmann combine tests	r12279
		$ HGMERGE=true hg merge
		merging foo
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -mm

		$ cd ../t

		Should work:

		$ hg pull -u ../tt
		pulling from ../tt
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (-1 heads)
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..