[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Ancestrally Related Error Message

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Mon, 17 Jun 2013 13:47:40 -0500

On Mon, Jun 17, 2013 at 12:59 PM, C M <cmanalyst66_at_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
Received on 2013-06-17 20:48:13 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.