Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 98515 invoked from network); 19 Jun 2006 23:02:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jun 2006 23:02:55 -0000 Received: (qmail 41517 invoked by uid 500); 19 Jun 2006 23:02:52 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 41474 invoked by uid 500); 19 Jun 2006 23:02:51 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 41463 invoked by uid 99); 19 Jun 2006 23:02:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 16:02:51 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of david.blevins@visi.com designates 208.42.156.2 as permitted sender) Received: from [208.42.156.2] (HELO conn.mc.mpls.visi.com) (208.42.156.2) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 16:02:50 -0700 Received: from [192.168.42.16] (68-171-58-68.vnnyca.adelphia.net [68.171.58.68]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by conn.mc.mpls.visi.com (Postfix) with ESMTP id B827681D8 for ; Mon, 19 Jun 2006 18:02:28 -0500 (CDT) Mime-Version: 1.0 (Apple Message framework v750) In-Reply-To: <4496F6D6.1070205@gmail.com> References: <4496F6D6.1070205@gmail.com> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: David Blevins Subject: Re: Web site update Date: Mon, 19 Jun 2006 16:02:27 -0700 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.750) X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N On Jun 19, 2006, at 12:11 PM, Hernan Cunico wrote: > Hi All, > I'm a bit lost with the two branches we have now to manage the web > site. I have the .../site/branches/may2006 branch updated and > ready to go live, it already includes that last two changes > (updated events and added book to documentation). > > What would be the next step? replacing the content of .../site/ > trunk and then commit to the live site from the updated trunk? how > do I replace it the content in .../site/trunk with the may2006 branch? Typically, you'd merge over your changes. Could use the 'svn merge' command. Or you could create a patch file and apply it to trunk. I like to use the graphical diff tool in Visual SlickEdit, but that's not free. -David