Mercurial > hg
view contrib/asv.conf.json @ 30755:0fbb3a5c188e
rebase: provide detailed hint to abort message if working dir is not clean
Detailed hint message is now provided when 'pull --rebase' operation detects
unclean working dir, for example:
abort: uncommitted changes
(cannot pull with rebase: please commit or shelve your changes first)
Added tests for uncommitted merge, and for subrepo support verifying that same
hint is also passed to subrepo state check.
author | Valters Vingolds <valters@vingolds.ch> |
---|---|
date | Tue, 10 Jan 2017 09:32:27 +0100 |
parents | cff0f5926797 |
children |
line wrap: on
line source
{ "version": 1, "project": "mercurial", "project_url": "https://mercurial-scm.org/", "repo": "..", "branches": ["default", "stable"], "environment_type": "virtualenv", "show_commit_url": "https://www.mercurial-scm.org/repo/hg/rev/", "benchmark_dir": "benchmarks", "env_dir": "../.asv/env", "results_dir": "../.asv/results", "html_dir": "../.asv/html" }