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

help: adding a topic on flags...

help: adding a topic on flags This is a short topic to explain how command-line flags can be specified. Some users have been confused by hg offerring different flag syntax than some other libraries, so it'd be nice to point them to this rather than explaining it every time. Differential Revision: https://phab.mercurial-scm.org/D1270

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r35036:b0262b25

default

Download file

             test-issue619.t
        
                    36 lines
            
             | 749 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue619.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ echo b > b

        $ hg branch b

        marked working directory as branch b

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

        $ hg ci -Amb

        adding b

        $ hg co -C 0

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

      Fast-forward:

        $ hg merge b

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

        (branch merge, don't forget to commit)

        $ hg ci -Ammerge

      Bogus fast-forward should fail:

        $ hg merge b

        abort: merging with a working directory ancestor has no effect

        [255]

      Even with strange revset (issue4465)

        $ hg merge ::.

        abort: merging with a working directory ancestor has no effect

        [255]

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

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

				$ echo b > b
				$ hg branch b
				marked working directory as branch b
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -Amb
				adding b

				$ hg co -C 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Fast-forward:

				$ hg merge b
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -Ammerge

				Bogus fast-forward should fail:

				$ hg merge b
				abort: merging with a working directory ancestor has no effect
				[255]

				Even with strange revset (issue4465)

				$ hg merge ::.
				abort: merging with a working directory ancestor has no effect
				[255]