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

filemerge: show warning about choice of :prompt only at an actual fallback...

filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

Patrick Mezard - - Load All Authors

File last commit:

r16536:63c817ea stable


                r32253:7d4ce4b5

default

Download file

             test-merge4.t
        
                    25 lines
            
             | 654 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ hg update 0

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

        $ echo This is file c1 > c

        $ hg add c

        $ hg commit -m "commit #2"

        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ rm b

        $ echo This is file c22 > c

      Test hg behaves when committing with a missing file added by a merge

        $ hg commit -m "commit #3"

        abort: cannot commit merge with missing files

        [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

				$ hg init
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ hg update 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo This is file c1 > c
				$ hg add c
				$ hg commit -m "commit #2"
				created new head
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ rm b
				$ echo This is file c22 > c

				Test hg behaves when committing with a missing file added by a merge

				$ hg commit -m "commit #3"
				abort: cannot commit merge with missing files
				[255]