upstream/mercurial-mirror Files · tests/test-bookmarks-merge.t

localrepo: introduce bookmarkheads...

localrepo: introduce bookmarkheads Similar to branch heads we introduce the notion of bookmarkheads. Bookmarkheads are changests that are bookmarked with the given bookmark or a diverged version

David Soria Parra - - Load All Authors

File last commit:

r16706:a270ec97 default


                r16707:f8dee1a8

default

Download file

             test-bookmarks-merge.t
        
                    31 lines
            
             | 806 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # init

        $ hg init

        $ echo a > a

        $ hg add a

        $ hg commit -m'a'

        $ echo b > b

        $ hg add b

        $ hg commit -m'b'

        $ hg up -C 0

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

        $ echo c > c

        $ hg add c

        $ hg commit -m'c'

        created new head

      # test merging of diverged bookmarks

        $ hg bookmark -r 1 "c@diverge"

        $ hg bookmark -r 1 b

        $ hg bookmark c

        $ hg bookmarks

           b                         1:d2ae7f538514

         * c                         2:d36c0562f908

           c@diverge                 1:d2ae7f538514

        $ hg merge "c@diverge"

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

        (branch merge, don't forget to commit)

        $ hg commit -m'merge'

        $ hg bookmarks

           b                         1:d2ae7f538514

         * c                         3:b8f96cf4688b

	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

				# init

				$ hg init
				$ echo a > a
				$ hg add a
				$ hg commit -m'a'
				$ echo b > b
				$ hg add b
				$ hg commit -m'b'
				$ hg up -C 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo c > c
				$ hg add c
				$ hg commit -m'c'
				created new head

				# test merging of diverged bookmarks
				$ hg bookmark -r 1 "c@diverge"
				$ hg bookmark -r 1 b
				$ hg bookmark c
				$ hg bookmarks
				b 1:d2ae7f538514
				* c 2:d36c0562f908
				c@diverge 1:d2ae7f538514
				$ hg merge "c@diverge"
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m'merge'
				$ hg bookmarks
				b 1:d2ae7f538514
				* c 3:b8f96cf4688b