summaryrefslogtreecommitdiff
path: root/subversion/tests/cmdline/svntest/tree.py
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2017-08-05 16:22:51 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2017-08-05 16:22:51 +0000
commitcf46733632c7279a9fd0fe6ce26f9185a4ae82a9 (patch)
treeda27775a2161723ef342e91af41a8b51fedef405 /subversion/tests/cmdline/svntest/tree.py
parentbb0ef45f7c46b0ae221b26265ef98a768c33f820 (diff)
downloadsubversion-tarball-master.tar.gz
Diffstat (limited to 'subversion/tests/cmdline/svntest/tree.py')
-rw-r--r--subversion/tests/cmdline/svntest/tree.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/subversion/tests/cmdline/svntest/tree.py b/subversion/tests/cmdline/svntest/tree.py
index b8dd03e..676c96a 100644
--- a/subversion/tests/cmdline/svntest/tree.py
+++ b/subversion/tests/cmdline/svntest/tree.py
@@ -610,6 +610,11 @@ def detect_conflict_files(node, extra_files):
logger.warn(str(node))
raise SVNTreeUnequal(msg)
+def detect_conflict_files_done(extra_files):
+ """Done handler for detect_conflict_files"""
+ if len(extra_files):
+ raise SVNTreeError("Not all extra reject files have been accounted for")
+
###########################################################################
###########################################################################
# EXPORTED ROUTINES ARE BELOW