Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6DA494C1 for ; Sun, 18 Dec 2011 13:28:16 +0000 (UTC) Received: (qmail 89578 invoked by uid 500); 18 Dec 2011 13:28:16 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 89549 invoked by uid 500); 18 Dec 2011 13:28:16 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 89542 invoked by uid 99); 18 Dec 2011 13:28:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 13:28:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 13:28:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 23E442388993 for ; Sun, 18 Dec 2011 13:27:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1220393 - /subversion/branches/file-handle-cache/subversion/svnserve/main.c Date: Sun, 18 Dec 2011 13:27:53 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111218132753.23E442388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Sun Dec 18 13:27:52 2011 New Revision: 1220393 URL: http://svn.apache.org/viewvc?rev=1220393&view=rev Log: On file_handle_cache branch: Fix merge artifact * subversion/svnserve/main.c (main): "-F" parameter shall not fall through to next case Modified: subversion/branches/file-handle-cache/subversion/svnserve/main.c Modified: subversion/branches/file-handle-cache/subversion/svnserve/main.c URL: http://svn.apache.org/viewvc/subversion/branches/file-handle-cache/subversion/svnserve/main.c?rev=1220393&r1=1220392&r2=1220393&view=diff ============================================================================== --- subversion/branches/file-handle-cache/subversion/svnserve/main.c (original) +++ subversion/branches/file-handle-cache/subversion/svnserve/main.c Sun Dec 18 13:27:52 2011 @@ -620,6 +620,7 @@ int main(int argc, const char *argv[]) case 'F': params.open_file_count = apr_strtoi64(arg, NULL, 0); + break; #ifdef WIN32 case SVNSERVE_OPT_SERVICE: