accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Keith Turner <ke...@deenlo.com>
Subject Re: That extra 'src'
Date Thu, 15 Mar 2012 15:09:36 GMT
On Mon, Mar 12, 2012 at 2:34 PM, Benson Margulies <bimargulies@gmail.com> wrote:
> It doesn't really make merges work much harder, since the scm's track the moves.

Does anyone have tips on this?  dist.xml was modified in 1.4.  I am
trying to merge 1.4 changes to trunk.  dist.xml has moved in trunk.

$ svn merge -r 1:HEAD
https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4
--- Merging r1300182 through r1301010 into '.':
   C src/assemble
Summary of conflicts:
  Tree conflicts: 1
maccloud:trunk rkturn2$ svn status
 M      .
!     C src/assemble
      >   local delete, incoming edit upon merge

So I get this tree conflict.  What I want it to do is to modify
dist.xml in the new location in trunk, but its not doing this.  I have
been looking online but have not found anything yet.

Keith

Mime
View raw message