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

bundlerepo: fix and improve getremotechanges...

bundlerepo: fix and improve getremotechanges Fixes the regression where incoming could show local changes introduced by rev 72c84f24b420.

Adrian Buehlmann - - Load All Authors

File last commit:

r14036:90d997a8 default


                r14161:8a0fca92

default

Download file

             test-pull-r.t
        
                    103 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-r.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo >> foo

        $ hg ci -m 'change foo'

        $ hg up -qC 0

        $ echo bar > bar

        $ hg ci -qAm 'add bar'

        $ hg log

        changeset:   2:effea6de0384

        tag:         tip

        parent:      0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add bar

        changeset:   1:ed1b79f46b9a

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ cd ..

      don't show "(+1 heads)" message when pulling closed head

        $ hg clone -q repo repo2

        $ hg clone -q repo2 repo3

        $ cd repo2

        $ hg up -q 0

        $ echo hello >> foo

        $ hg ci -mx1

        created new head

        $ hg ci -mx2 --close-branch

        $ cd ../repo3

        $ hg heads -q --closed

        2:effea6de0384

        1:ed1b79f46b9a

        $ hg pull

        pulling from $TESTTMP/repo2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg heads -q --closed

        4:996201fa1abf

        2:effea6de0384

        1:ed1b79f46b9a

        $ cd ..

        $ hg init copy

        $ cd copy

      Pull a missing revision:

        $ hg pull -qr missing ../repo

        abort: unknown revision 'missing'!

        [255]

      Pull multiple revisions with update:

        $ hg pull -qu -r 0 -r 1 ../repo

        $ hg -q parents

        0:bbd179dfa0a7

        $ hg rollback

        repository tip rolled back to revision -1 (undo pull)

        working directory now based on revision -1

        $ hg pull -qr 0 ../repo

        $ hg log

        changeset:   0:bbd179dfa0a7

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ hg pull -qr 1 ../repo

        $ hg log

        changeset:   1:ed1b79f46b9a

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

      This used to abort: received changelog group is empty:

        $ hg pull -qr 1 ../repo

	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 repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'
				$ echo >> foo
				$ hg ci -m 'change foo'
				$ hg up -qC 0
				$ echo bar > bar
				$ hg ci -qAm 'add bar'

				$ hg log
				changeset: 2:effea6de0384
				tag: tip
				parent: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add bar

				changeset: 1:ed1b79f46b9a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ cd ..

				don't show "(+1 heads)" message when pulling closed head

				$ hg clone -q repo repo2
				$ hg clone -q repo2 repo3
				$ cd repo2
				$ hg up -q 0
				$ echo hello >> foo
				$ hg ci -mx1
				created new head
				$ hg ci -mx2 --close-branch
				$ cd ../repo3
				$ hg heads -q --closed
				2:effea6de0384
				1:ed1b79f46b9a
				$ hg pull
				pulling from $TESTTMP/repo2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg heads -q --closed
				4:996201fa1abf
				2:effea6de0384
				1:ed1b79f46b9a

				$ cd ..

				$ hg init copy
				$ cd copy

				Pull a missing revision:

				$ hg pull -qr missing ../repo
				abort: unknown revision 'missing'!
				[255]

				Pull multiple revisions with update:

				$ hg pull -qu -r 0 -r 1 ../repo
				$ hg -q parents
				0:bbd179dfa0a7
				$ hg rollback
				repository tip rolled back to revision -1 (undo pull)
				working directory now based on revision -1

				$ hg pull -qr 0 ../repo
				$ hg log
				changeset: 0:bbd179dfa0a7
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ hg pull -qr 1 ../repo
				$ hg log
				changeset: 1:ed1b79f46b9a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo


				This used to abort: received changelog group is empty:

				$ hg pull -qr 1 ../repo