##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2775:4a4ea797 default
r2784:e8c62649 default
Show More
pytest.ini
16 lines | 522 B | text/x-ini | IniLexer
project: added all source files and assets
r1 [pytest]
tests: updated pytest.ini
r2328 testpaths = rhodecode
norecursedirs = rhodecode/public rhodecode/templates tests/scripts
tests: use custom cache dir for pytest caches
r2775 cache_dir = /tmp/.pytest_cache
tests: updated pytest.ini
r2328
pytest: renamed pylons_config into pyramid_config.
r2369 pyramid_config = rhodecode/tests/rhodecode.ini
Martin Bornhold
pytest: Use http as default backend in pytest configuration.
r969 vcsserver_protocol = http
vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
pytest: use ipdb as default --pdb handler
r2102
addopts =
--pdbcls=IPython.terminal.debugger:TerminalPdb
project: added all source files and assets
r1 markers =
vcs_operations: Mark tests depending on a running RhodeCode instance.
xfail_backends: Mark tests as xfail for given backends.
skip_backends: Mark tests as skipped for given backends.