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

changegroup: introduce safeversion()...

changegroup: introduce safeversion() In a few places (at least repair.py and shelve.py), we want to find the best changegroup version that we can assume users of the repo will understand. For example, we choose version 01 by default, but if it's a generaldelta repo, we expect clients to support version 02 anyway, so we choose that for new bundles (for e.g. "hg strip"). Let's create a helper for this functionality in changegroup, so we can reuse it elsewhere later.

liscju - - Load All Authors

File last commit:

r26968:216cc65c default


                r27929:3b2ac211

stable

Download file

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

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

        abort: not updating: not a linear update

        (merge or update --check to force update)

        [255]

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

        abort: not updating: not a linear update

        (merge or update --check to force update)

        [255]

        $ 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

        $ 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

				$ 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)
				abort: not updating: not a linear update
				(merge or update --check to force update)
				[255]

				$ 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)
				abort: not updating: not a linear update
				(merge or update --check to force update)
				[255]

				$ 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

				$ cd ..