Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of lesmikesell@gmail.com
 designates 209.85.212.48 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CADShvWHbRxbW56OR40+nZm6oDFK2Jdq2vL=_xXnEa+mE1+K-tw@mail.gmail.com>
References: 
 <CADShvWGgvLMLwKqdeJPh7469yP-GizMiYtkzNx-qqJtCtF3peQ@mail.gmail.com>
	<51BF2D68.2090100@collab.net>
	<CADShvWHD-0v8a4TQeBs+auZ9FhOkS3zQs1SxocguM_zTH9HmAQ@mail.gmail.com>
	<1B05D8F50421E24799AE93B03CC284BE01C5AFF08A@CRPMBX01.corp.cbeyond.net>
	<CADShvWHbRxbW56OR40+nZm6oDFK2Jdq2vL=_xXnEa+mE1+K-tw@mail.gmail.com>
Date: Mon, 17 Jun 2013 13:47:40 -0500
Message-ID: 
 <CAOAgVpyT2rSnZ0b=+GuRuRnehA82koacwDaDaqAuaLBAoKumyw@mail.gmail.com>
Subject: Re: Ancestrally Related Error Message
From: Les Mikesell <lesmikesell@gmail.com>
To: C M <cmanalyst66@gmail.com>
Cc: Andrew Reedick <Andrew.Reedick@cbeyond.net>,
 "C. Michael Pilato" <cmpilato@collab.net>,
	Subversion <users@subversion.apache.org>
Content-Type: text/plain; charset=ISO-8859-1

On Mon, Jun 17, 2013 at 12:59 PM, C M <cmanalyst66@gmail.com> wrote:
> We are on SVN 1.7.6.
>
> Trunk is empty because this is/was a new development effort. The code was
> directly imported into the developer's branch.
>
> I ran these two commans in the working copy and get the messages you
> mentioned. What does that mean?
>
> c:\Temp\DEV_WC>svn merge --dry-run --revision 1190:1233
> c:\Temp\DEV_WC>svn status
>  M      .
> !     C MMI
>       >   local delete, incoming edit upon merge
[...]

And you are merging into a working copy that is a checkout of the
empty trunk?   Anyway if the trunk is empty you should get the same
result if you just copy the branch to it.

--
   Les Mikesell
     lesmikesell@gmail.com