[chef] RE: Re: site installing tomcat cookbook git deleted files from my java cookbook

[RUSSELL Scott < >]

Andrea,
             I think I had a similar issue, where initially on the master 
branch, I just copied the java cookbook into place on the filesystem(no knife 
command at all).  I subsequently did as you did and used knife to install the 
cookbook, which created the vendor branches and then does a merge to 
master(seemingly overwriting the java cookbook, that I had manually installed 
initially).   I never did track it down, as I had a backup of the repo 
anyway, and just did my own merge.    Maybe you did something similar 
initially?

                                                 Sc0tt....

________________________________________
From: Andrea Campi 

 
Sent: 11 January 2012 14:38
To: 

 
Subject: [chef] Re: site installing tomcat cookbook git deleted files from my 
java cookbook

On Wed, Jan 11, 2012 at 4:08 AM, 
<
 <mailto:
 >>
 wrote:

hi. is this expected? maybe it's something i don't understand about git
and git branching and community cookbooks.

long ago i had done "knife cookbook site install java", and committed
that cookbook to my own git repo. over time, i modifed that java
cookbook (added some templates, modifed the default recipe).

just now i did a "knife cookbook site install tomcat", and doing so
whacked my mods to the java cookbook.

Uhm, I see this though:

Creating pristine copy branch chef-vendor-java

So it seems knife disagrees, and couldn't find your previous site-install of 
the java cookbook.
Otherwise it would have merged them instead of overwriting them.
Double check your history—computers are usually more correct about this kind 
of stuff than human memory ;)

Andrea