upstream/mercurial-mirror Files · tests/test-issue1877.t

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r38637:c829749e

default

Download file

             test-issue1877.t
        
                    47 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1877.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/1877

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add a

        $ hg ci -m 'a'

        $ echo b > a

        $ hg ci -m'b'

        $ hg up 0

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

        $ hg book main

        $ hg book

         * main                      0:cb9a9f314b8b

        $ echo c > c

        $ hg add c

        $ hg ci -m'c'

        created new head

        $ hg book

         * main                      2:d36c0562f908

        $ hg heads

        changeset:   2:d36c0562f908

        bookmark:    main

        tag:         tip

        parent:      0:cb9a9f314b8b

        user:        test

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

        summary:     c

        changeset:   1:1e6c11564562

        user:        test

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

        summary:     b

        $ hg up 1e6c11564562

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

        (leaving bookmark main)

        $ hg merge main

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

        (branch merge, don't forget to commit)

        $ hg book

           main                      2:d36c0562f908

        $ hg ci -m'merge'

        $ hg book

           main                      2:d36c0562f908

        $ 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

				https://bz.mercurial-scm.org/1877

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg add a
				$ hg ci -m 'a'
				$ echo b > a
				$ hg ci -m'b'
				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg book main
				$ hg book
				* main 0:cb9a9f314b8b
				$ echo c > c
				$ hg add c
				$ hg ci -m'c'
				created new head
				$ hg book
				* main 2:d36c0562f908
				$ hg heads
				changeset: 2:d36c0562f908
				bookmark: main
				tag: tip
				parent: 0:cb9a9f314b8b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: c

				changeset: 1:1e6c11564562
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: b

				$ hg up 1e6c11564562
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(leaving bookmark main)
				$ hg merge main
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg book
				main 2:d36c0562f908
				$ hg ci -m'merge'
				$ hg book
				main 2:d36c0562f908

				$ cd ..