Re: Dev - SVN keywords

Posted by Kenneth Porter on Mar 29, 2006; 12:07am
URL: http://ofbiz.116.s1.nabble.com/Dev-SVN-keywords-tp167385p167401.html

On Monday, March 27, 2006 8:24 AM +0200 Jacopo Cappellato <[hidden email]>
wrote:

> Anyone can help me to answer the BIG QUESTION at the bottom of the page?
> Also any review is welcome!

svn merge arg1 arg2 arg3

This takes the difference between arg1 and arg2 and applies the result to
arg3. So if arg3 (your working copy) started as r5000 but has all changes
in r5100 already merged in, arg1 should be the vendor source for r5100.
(arg2 is the latest vendor drop.)
 
_______________________________________________
Dev mailing list
[hidden email]
http://lists.ofbiz.org/mailman/listinfo/dev