[meld] Update VC base to include an unimplemented get_path_for_conflict

[Kai Willadsen <kaiw src gnome org>]

commit 5c31a6f1e16a205435e8e998c3ce332d2d408688
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 18 07:03:23 2013 +1000

    Update VC base to include an unimplemented get_path_for_conflict
    
    This stops tracebacks and other fun things when a system implements
    enough to hit the conflict codepath, but doesn't actually implement
    the conflict path getter.

 meld/vc/_vc.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 46ee155..8da6e7b 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -163,6 +163,14 @@ class Vc(object):
         """
         raise NotImplementedError()
 
+    def get_path_for_conflict(self, path, conflict):
+        """Returns a file path for the conflicted repository path
+
+        *conflict* is the side of the conflict to be retrieved, and
+        must be one of the CONFLICT_* constants.
+        """
+        raise NotImplementedError()
+
     def check_repo_root(self, location):
         if not os.path.isdir(os.path.join(location, self.VC_DIR)):
             raise ValueError