subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Les Mikesell <lesmikes...@gmail.com>
Subject Re: Ancestrally Related Error Message
Date Mon, 17 Jun 2013 18:47:40 GMT
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

Mime
View raw message