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

bookmarks: use 'applychanges' for bookmark update...

bookmarks: use 'applychanges' for bookmark update There is still some use of 'deletedivergent' bookmark here. They will be taken care of later. The 'deletedivergent' code needs some rework before fitting in the new world.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r33491:1adcb594

default

Download file

             test-issue842.t
        
                    39 lines
            
             | 725 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue842.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ hg init

        $ echo foo > a

        $ hg ci -Ama

        adding a

        $ hg up -r0000

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

        $ echo bar > a

      Should issue new head warning:

        $ hg ci -Amb

        adding a

        created new head

        $ hg up -r0000

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

        $ echo stuffy > a

      Should not issue new head warning:

        $ hg ci -q -Amc

        $ hg up -r0000

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

        $ echo crap > a

        $ hg branch testing

        marked working directory as branch testing

        (branches are permanent and global, did you want a bookmark?)

      Should not issue warning:

        $ hg ci -q -Amd

	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/842

				$ hg init
				$ echo foo > a
				$ hg ci -Ama
				adding a

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo bar > a

				Should issue new head warning:

				$ hg ci -Amb
				adding a
				created new head

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo stuffy > a

				Should not issue new head warning:

				$ hg ci -q -Amc

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo crap > a
				$ hg branch testing
				marked working directory as branch testing
				(branches are permanent and global, did you want a bookmark?)

				Should not issue warning:

				$ hg ci -q -Amd