upstream/mercurial-mirror Files · tests/test-check-config.t

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

timeless - - Load All Authors

File last commit:

r29219:3c9066ed default


                r32057:e5ffc91a

stable

Download file

             test-check-config.t
        
                    9 lines
            
             | 247 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-config.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

        $ . "$TESTDIR/helpers-testrepo.sh"

        $ cd "$TESTDIR"/..

      New errors are not allowed. Warnings are strongly discouraged.

        $ hg files "set:(**.py or **.txt) - tests/**" | sed 's|\\|/|g' |

        >   python contrib/check-config.py

	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

				#require test-repo

				$ . "$TESTDIR/helpers-testrepo.sh"
				$ cd "$TESTDIR"/..

				New errors are not allowed. Warnings are strongly discouraged.

				$ hg files "set:(.py or .txt) - tests/**" \| sed 's\|\\\|/\|g' \|
				> python contrib/check-config.py