Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Received-SPF: pass (asf.osuosl.org: domain of hcunico@gmail.com designates
 64.233.184.234 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=C+7KMfL43aAQOoDwUBokGgbt3f5h9XGutr+NCNw5Hu7XhWux9M7OTGWiwXlQ9VUo0tv5KeR3zuFqo3tFoKhFLGPL8bt51RoYgPPIYAdFksB0bxK1gYQaOARpPi4oXGCrQ7c2dw6+0jv2XhUw87rjpRI50uqb4FMmyzoP6TfHXqQ=
Message-ID: <4497FA48.9090002@gmail.com>
Date: Tue, 20 Jun 2006 09:38:16 -0400
From: Hernan Cunico <hcunico@gmail.com>
User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)
MIME-Version: 1.0
To: dev@geronimo.apache.org
Subject: Re: Web site update
References: <4496F6D6.1070205@gmail.com>
 <F0FD4F46-6652-46D8-BD38-2BD61733129D@visi.com>
In-Reply-To: <F0FD4F46-6652-46D8-BD38-2BD61733129D@visi.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Merging isn't working, I don't see anything being updated into trunk.
How do I create a patch if my local working copy is fully in sync with the branch, not the trunk.

Is there a way to copy/move the content of the branch and overwrite the trunk?

Thanks

Hernan

David Blevins wrote:
> 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
> 
>