mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 07:18:27 +01:00
scm: move FileNotInRepoError and MergeConflictError to scm.exceptions
This commit is contained in:
committed by
Ruslan Kuprieiev
parent
cab60b54f8
commit
c19a11152a
@@ -344,7 +344,7 @@ def test_commit_no_verify(tmp_dir, scm, git, hook):
|
||||
|
||||
@pytest.mark.parametrize("squash", [True, False])
|
||||
def test_merge(tmp_dir, scm, git, squash):
|
||||
from dvc.scm.base import MergeConflictError
|
||||
from dvc.scm.exceptions import MergeConflictError
|
||||
|
||||
if git.test_backend == "dulwich":
|
||||
pytest.skip()
|
||||
@@ -399,7 +399,7 @@ def test_checkout_index(tmp_dir, scm, git):
|
||||
"strategy, expected", [("ours", "baz"), ("theirs", "bar")]
|
||||
)
|
||||
def test_checkout_index_conflicts(tmp_dir, scm, git, strategy, expected):
|
||||
from dvc.scm.base import MergeConflictError
|
||||
from dvc.scm.exceptions import MergeConflictError
|
||||
|
||||
if git.test_backend == "dulwich":
|
||||
pytest.skip()
|
||||
|
||||
Reference in New Issue
Block a user