From d2e182c58b325679e9b708eb234701b091b66e31 Mon Sep 17 00:00:00 2001 From: Jan Danielsson Date: Wed, 19 Sep 2012 05:39:11 +1000 Subject: [PATCH 02/11] 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 file changed, 1 insertion(+), 1 deletion(-) 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 = { -- 1.7.10.4