[meld/meld-1.6] Support new .fslckout name for Fossil VC (closes bgo#683969)



commit d2e182c58b325679e9b708eb234701b091b66e31
Author: Jan Danielsson <jan m danielsson gmail com>
Date:   Wed Sep 19 05:39:11 2012 +1000

    Support new .fslckout name for Fossil VC (closes bgo#683969)
    
    The name ".fos" for the local checkout state database will be
    deprecated, and ".fslckout" will be used instead. ".fos" is still
    recognized for compatibility.

 meld/vc/fossil.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/fossil.py b/meld/vc/fossil.py
index 3908cb1..f3dfe23 100644
--- a/meld/vc/fossil.py
+++ b/meld/vc/fossil.py
@@ -32,7 +32,7 @@ class Vc(_vc.CachedVc):
 
     CMD = "fossil"
     NAME = "Fossil"
-    VC_METADATA = ["_FOSSIL_", ".fos"]    # One or the other
+    VC_METADATA = [".fslckout", "_FOSSIL_", ".fos"]    # One or the other
     PATCH_INDEX_RE = "^--- (.*)$"
 
     state_map = {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]