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

clone: do not turn hidden changeset public on publishing clone (issue3935)...

clone: do not turn hidden changeset public on publishing clone (issue3935) Before this changeset local clone of a repo with hidden changeset would include then in the clone (why not) and turn them public (plain wrong). This happened because the copy clone publish by dropping the phaseroot file entirely making everything in the repo public (and therefore immune to obsolescence marker). This changeset takes the simplest fix, we deny the copy clone in the case of hidden changeset falling back to pull clone that will exclude them from the clone and therefore not turning them public. A smarter version of copy clone could be done, but I prefer to go for the simplest solution first.

Siddharth Agarwal - - Load All Authors

File last commit:

r19798:76df01e5 default


                r20332:a959f716

stable

Download file

             test-pull-update.t
        
                    64 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)

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

              r19798
            
        not updating: not a linear update

        (merge or update --check to force update)

        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)

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

              r19798
            
        not updating: not a linear update

        (merge or update --check to force update)

        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)
Siddharth Agarwal update: improve error message for clean non-linear update	r19798	not updating: not a linear update
		(merge or update --check to force update)
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)
Siddharth Agarwal update: improve error message for clean non-linear update	r19798	not updating: not a linear update
		(merge or update --check to force update)
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 ..