dev@glassfish.java.net

Re: Use svn merge instead of simple copying

From: Jason Lee <jason.d.lee_at_oracle.com>
Date: Mon, 02 May 2011 15:34:12 -0500

I'd much rather have this on my local machine, ready to use:
http://book.git-scm.com/book.pdf ;)

On 5/2/11 3:30 PM, Edward Burns wrote:
> On 5/2/11 9:48 , Justin Lee wrote:
>> Or use "svn cp" rather than "cp foo bar ; svn add bar" Preserves the
>> history that way. Same for mv.
>>
>> On 5/1/11 11:39 PM, Sahoo wrote:
>>> I see some files being simply copied from one branch to another
>>> instead of them being merged using svn merge command. Take a minute to
>>> know how merge command works and use it next time. It saves your
>>> colleagues from spending time to find out what changes have been
>>> ported from one branch to another.
>
> I can't agree more. This is vitally important.
>
> This file should be on your local machine and ready to pop-open using
> a programmable function key [1].
>
> http://svnbook.red-bean.com/en/1.1/svn-book.pdf
>
> Ed
>
>
> [1] http://www.computerhope.com/jargon/p/progrkey.htm


-- 
Jason Lee 
Senior Member of Technical Staff
GlassFish REST API / Administration Console
Oracle Corporation
Phone +1 405-216-3193
Blog http://blogs.steeplesoft.com