Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: <derby-dev@db.apache.org>
Received-SPF: pass (asf.osuosl.org: domain of ksunithaghm@gmail.com designates
 64.233.184.233 as permitted sender)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:user-agent:x-accept-language:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding;
        b=YLroU9GqWtHYyiCCzeFFxKOl/K4tDXh9G7LB4P8ez3MtdRGDDXFcYfOZoo46SDQ7pKWXbWxykk0Aw1FTwEsySKySV6r3LlkgiNhZ77XkqKGUerYWa7GZBozjvJpu29/qZIEsvm+Tfzo+M1/b6CN0HuvWJvA4O3P2zDYquUZ5ySs=
Message-ID: <44C11013.708@gmail.com>
Date: Fri, 21 Jul 2006 10:34:11 -0700
From: Sunitha Kambhampati <ksunithaghm@gmail.com>
User-Agent: Mozilla Thunderbird 0.7.3 (Windows/20040803)
MIME-Version: 1.0
To: derby-dev@db.apache.org
Subject: svn merge does not add the new files, the stat will show  A + which
 is just the property change for newfiles.  ( was Re: [jira] Updated:
 (DERBY-1373)
 Encrypted databases cannot be booted using the jar subprotocol (and possibly
 also using http/https/classpath)
References: <12503034.1149286949847.JavaMail.jira@brutus>
	 <6724257.1153500855375.JavaMail.jira@brutus>
 <58ed70f50607211019g73e920ffie3565b0951f4a807@mail.gmail.com>
In-Reply-To: <58ed70f50607211019g73e920ffie3565b0951f4a807@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Deepa Remesh wrote:

> I just took a look at this patch when I saw "A  + " mentioned in the
> svn status. When merging and creating a new patch for a branch, I have
> seen that "A  + " in svn status indicates only property change for new
> files. The contents of the new files are not added to the patch file.
> This had happened to me once but I have not looked at what the correct
> svn behaviour should be. To include the new files, I had done an "svn
> revert" and "svn add" for the "A  + " files.

Thanks very much Deepa for pointing this out.   I had not realized that 
was the case, since the merge did get the files in the codeline and when 
I ran tests, I checked for the new added test and it passed.

I'll update the wiki with these instructions for merging changes to a 
branch.

Does anyone know if there is any other way to have the merge command add 
the files.

Thanks,
Sunitha.