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

bundlerepo: fix and improve getremotechanges...

bundlerepo: fix and improve getremotechanges Fixes the regression where incoming could show local changes introduced by rev 72c84f24b420.

Matt Mackall - - Load All Authors

File last commit:

r12316:4134686b default


                r14161:8a0fca92

default

Download file

             test-conflict.t
        
                    33 lines
            
             | 681 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-conflict.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo "nothing" > a

        $ hg add a

        $ hg commit -m ancestor

        $ echo "something" > a

        $ hg commit -m branch1

        $ hg co 0

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

        $ echo "something else" > a

        $ hg commit -m branch2

        created new head

        $ hg merge 1

        merging a

        warning: conflicts during merge.

        merging a failed!

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ hg id

        32e80765d7fe+75234512624c+ tip

        $ cat a

        <<<<<<< local

        something else

        =======

        something

        >>>>>>> other

        $ hg status

        M a

        ? a.orig

	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

				$ hg init
				$ echo "nothing" > a
				$ hg add a
				$ hg commit -m ancestor
				$ echo "something" > a
				$ hg commit -m branch1
				$ hg co 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo "something else" > a
				$ hg commit -m branch2
				created new head

				$ hg merge 1
				merging a
				warning: conflicts during merge.
				merging a failed!
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ hg id
				32e80765d7fe+75234512624c+ tip

				$ cat a
				<<<<<<< local
				something else
				=======
				something
				>>>>>>> other

				$ hg status
				M a
				? a.orig