From d67cf6eb1990af2a43a0f6cdb3830fded7ff4766 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Wed, 26 Oct 2016 15:43:03 +0200 Subject: [PATCH] vcs: Add merge failure reasons for missing target ref and missing source ref. --- rhodecode/lib/vcs/backends/base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py index 93259f23..517d93f0 100644 --- a/rhodecode/lib/vcs/backends/base.py +++ b/rhodecode/lib/vcs/backends/base.py @@ -97,6 +97,12 @@ class MergeFailureReason(object): # A involved commit could not be found. MISSING_COMMIT = 8 + # The target repo reference is missing. + MISSING_TARGET_REF = 9 + + # The source repo reference is missing. + MISSING_SOURCE_REF = 10 + class BaseRepository(object): """