upstream/mercurial-mirror Files · tests/blacklists

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.

Siddharth Agarwal -


            r32057:e5ffc91a

stable

Name	Size	Modified	Last Commit	Author
/ tests / blacklists
README	Loading ...
fsmonitor	Loading ...
linux-vfat	Loading ...

tests/blacklists/README

            
Put here definitions of blacklists for run-tests.py

Create a file per blacklist. Each file should list the names of tests that you
want to be skipped.
File names are meant to be used as targets for run-tests.py --blacklist
option.
Lines starting with # are ignored. White spaces are stripped.

e.g. if you create a blacklist/example file containing:
 test-hgrc
 # some comment
 test-help
then calling "run-tests.py --blacklist blacklists/example" will exclude
test-hgrc and test-help from the list of tests to run.
          

	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