From 320bf2d85e9e2924d896b3072979598c954922e7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 22 Aug 2018 20:06:26 +0200
Subject: [PATCH] patch 8.1.0317: Cscope test fails when using shadow directory

Problem:    Cscope test fails when using shadow directory.
Solution:   Resolve symlink in Vim. (James McCoy, closes #3364)
---
 src/testdir/test_cscope.vim | 7 ++++++-
 src/version.c               | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index 71d5487ce..63f2c182e 100644
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -259,7 +259,12 @@ endfunc
 " Test ":cs add {dir}"  (add the {dir}/cscope.out database)
 func Test_cscope_add_dir()
   call mkdir('Xcscopedir', 'p')
-  call system('cscope -bk -fXcscopedir/cscope.out ../memfile_test.c')
+
+  " Cscope doesn't handle symlinks, so this needs to be resolved in case a
+  " shadow directory is being used.
+  let memfile = resolve('../memfile_test.c')
+  call system('cscope -bk -fXcscopedir/cscope.out ' . memfile)
+
   cs add Xcscopedir
   let a = execute('cscope show')
   let lines = split(a, "\n", 1)
diff --git a/src/version.c b/src/version.c
index 0ffd11e4f..d5993815c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    317,
 /**/
     316,
 /**/
-- 
2.50.1