[PATCH][merge-tracking] Fix build failure as a result of r23946

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[
On the merge-tracking branch: Fix build failure as a result of r23946.

* subversion/libsvn_client/diff.c
  (get_wc_merge_info):
   '#elif' -> '#else'

Patch by:kameshj
]]]

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 23951)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1820,7 +1820,7 @@
                && (wcpath[2] == '/')
                && ((wcpath[0] >= 'A' && wcpath[0] <= 'Z')
                    || (wcpath[0] >= 'a' && wcpath[0] <= 'z'))))
-#elif
+#else
       if (!(strlen(wcpath) > 0 && wcpath[0] == '/'))
 #endif /* WIN32 or Cygwin */
         {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 21 10:09:35 2007