upstream/mercurial-mirror Files · tests/test-revlog-group-emptyiter.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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32253:7d4ce4b5

default

Download file

             test-revlog-group-emptyiter.t
        
                    35 lines
            
             | 685 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-group-emptyiter.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue1678: IndexError when pushing

      setting up base repo

        $ hg init a

        $ cd a

        $ touch a

        $ hg ci -Am a

        adding a

        $ cd ..

      cloning base repo

        $ hg clone a b

        updating to branch default

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

        $ cd b

      setting up cset to push

        $ hg up null

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

        $ touch a

      different msg so we get a clog new entry

        $ hg ci -Am b

        adding a

        created new head

      pushing

        $ hg push -f ../a

        pushing to ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        $ cd ..

	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

				Issue1678: IndexError when pushing

				setting up base repo
				$ hg init a
				$ cd a
				$ touch a
				$ hg ci -Am a
				adding a
				$ cd ..

				cloning base repo
				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd b

				setting up cset to push
				$ hg up null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ touch a
				different msg so we get a clog new entry
				$ hg ci -Am b
				adding a
				created new head

				pushing
				$ hg push -f ../a
				pushing to ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)

				$ cd ..