db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sunitha Kambhampati <ksunitha...@gmail.com>
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)
Date Fri, 21 Jul 2006 17:34:11 GMT
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.

Mime
View raw message