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

mq: fix qpush recursion in _findtags when status file is wrong (issue2664)...

mq: fix qpush recursion in _findtags when status file is wrong (issue2664) test from timeless to guard against regressing this

Mads Kiilerich - - Load All Authors

File last commit:

r13158:9e7e2405 default


                r13508:0396ca80

stable

Download file

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

      http://mercurial.selenic.com/bts/issue619

        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ echo b > b

        $ hg branch b

        marked working directory as branch b

        $ 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 branch

        default

        $ hg parent --template '{rev}:{node|short} {branches}: {desc}\n'

        1:06c2121185be b: b

        $ hg ci -Ammerge

        created new head

      Bogus fast-forward should fail:

        $ hg merge b

        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

				http://mercurial.selenic.com/bts/issue619

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

				$ echo b > b
				$ hg branch b
				marked working directory as branch b
				$ 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 branch
				default
				$ hg parent --template '{rev}:{node\|short} {branches}: {desc}\n'
				1:06c2121185be b: b
				$ hg ci -Ammerge
				created new head

				Bogus fast-forward should fail:

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