Return-Path: 
 <commits-return-14096-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7832F107F8
	for <apmail-jackrabbit-commits-archive@www.apache.org>;
 Fri,  3 May 2013 10:37:53 +0000 (UTC)
Received: (qmail 70039 invoked by uid 500); 3 May 2013 10:37:53 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 69828 invoked by uid 500); 3 May 2013 10:37:47 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 69787 invoked by uid 99); 3 May 2013 10:37:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 May 2013 10:37:45 +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; Fri, 03 May 2013 10:37:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D2E442388994;
	Fri,  3 May 2013 10:37:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1478718 -
 /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
Date: Fri, 03 May 2013 10:37:22 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130503103722.D2E442388994@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Fri May  3 10:37:22 2013
New Revision: 1478718

URL: http://svn.apache.org/r1478718
Log:
JCR-3585: Merge/update does not skip simpleVersionable content

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java?rev=1478718&r1=1478717&r2=1478718&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java Fri May  3 10:37:22 2013
@@ -92,7 +92,8 @@ abstract public class VersionManagerImpl
         if (shallow) {
             // If <code>isShallow</code> is <code>true</code> and this node is not
             // versionable, then this method returns and no changes are made.
-            if (!state.getEffectiveNodeType().includesNodeType(NameConstants.MIX_VERSIONABLE)) {
+            if (!state.getEffectiveNodeType().includesNodeType(
+                    NameConstants.MIX_SIMPLE_VERSIONABLE)) {
                 return;
             }
         }