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

graft: do not try to skip rev derived from ancestor more than once (issue6024)...

graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r40692:3bc2e550

stable

Download file

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

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

        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

        moving src/a.c to source/a.c

        $ hg ci -Ammove

        $ hg co -C 0

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

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

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

        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        ? src/a.o

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

				$ hg init
				$ mkdir src
				$ echo a > src/a.c
				$ hg ci -Ama
				adding src/a.c

				$ hg mv src source
				moving src/a.c to source/a.c

				$ hg ci -Ammove

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

				$ echo new > src/a.c
				$ echo compiled > src/a.o
				$ hg ci -mupdate
				created new head

				$ hg status
				? src/a.o

				$ hg merge
				merging src/a.c and source/a.c to source/a.c
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg status
				M source/a.c
				R src/a.c
				? src/a.o