dev@glassfish.java.net

Re: Use svn merge instead of simple copying

From: Edward Burns <edward.burns_at_oracle.com>
Date: Mon, 02 May 2011 16:30:21 -0400

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