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

bookmarks: pull --update updates to active bookmark if it moved (issue4007)...

bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r19095:5cc71484 stable


                r19523:f37b5a17

2.7 stable

Download file

             test-update-reverse.t
        
                    84 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-reverse.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ touch a

        $ hg add a

        $ hg commit -m "Added a"

        $ touch main

        $ hg add main

        $ hg commit -m "Added main"

        $ hg checkout 0

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

      'main' should be gone:

        $ ls

        a

        $ touch side1

        $ hg add side1

        $ hg commit -m "Added side1"

        created new head

        $ touch side2

        $ hg add side2

        $ hg commit -m "Added side2"

        $ hg log

        changeset:   3:91ebc10ed028

        tag:         tip

        user:        test

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

        summary:     Added side2

        changeset:   2:b932d7dbb1e1

        parent:      0:c2eda428b523

        user:        test

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

        summary:     Added side1

        changeset:   1:71a760306caf

        user:        test

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

        summary:     Added main

        changeset:   0:c2eda428b523

        user:        test

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

        summary:     Added a

        $ hg heads

        changeset:   3:91ebc10ed028

        tag:         tip

        user:        test

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

        summary:     Added side2

        changeset:   1:71a760306caf

        user:        test

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

        summary:     Added main

        $ ls

        a

        side1

        side2

        $ hg update --debug -C 1

        resolving manifests

         branchmerge: False, force: True, partial: False

         ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf

         side1: other deleted -> r

         side2: other deleted -> r

         main: remote created -> g

        removing side1

        removing side2

        updating: side2 2/3 files (66.67%)

        getting main

        updating: main 3/3 files (100.00%)

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

        $ ls

        a

        main

	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

				$ touch a
				$ hg add a
				$ hg commit -m "Added a"

				$ touch main
				$ hg add main
				$ hg commit -m "Added main"
				$ hg checkout 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				'main' should be gone:

				$ ls
				a

				$ touch side1
				$ hg add side1
				$ hg commit -m "Added side1"
				created new head
				$ touch side2
				$ hg add side2
				$ hg commit -m "Added side2"

				$ hg log
				changeset: 3:91ebc10ed028
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added side2

				changeset: 2:b932d7dbb1e1
				parent: 0:c2eda428b523
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added side1

				changeset: 1:71a760306caf
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added main

				changeset: 0:c2eda428b523
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added a


				$ hg heads
				changeset: 3:91ebc10ed028
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added side2

				changeset: 1:71a760306caf
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added main

				$ ls
				a
				side1
				side2

				$ hg update --debug -C 1
				resolving manifests
				branchmerge: False, force: True, partial: False
				ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
				side1: other deleted -> r
				side2: other deleted -> r
				main: remote created -> g
				removing side1
				removing side2
				updating: side2 2/3 files (66.67%)
				getting main
				updating: main 3/3 files (100.00%)
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				$ ls
				a
				main