Instead of doing "svn merge ../accumulo-1.4 " from the 1.5 directory, you also do "svn merge ../accumulo-1.4/src ." That should handle most changes, unless you changed something other than source, at which point you should directly do those directories. On Mon, May 13, 2013 at 12:41 AM, Corey Nolet <[EMAIL PROTECTED]> wrote:
> Hey Guys, > > Can anyone describe the current merge plan for dealing with the directory > changes between 1.4 and 1.5? There are already slight differences in my > patches between these versions. > > > Thanks! >
NEW: Monitor These Apps!
All projects made searchable here are trademarks of the Apache Software Foundation.
Service operated by Sematext