Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4938510B9B for ; Mon, 17 Jun 2013 21:02:09 +0000 (UTC) Received: (qmail 6495 invoked by uid 500); 17 Jun 2013 21:02:08 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 6479 invoked by uid 500); 17 Jun 2013 21:02:08 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 6472 invoked by uid 99); 17 Jun 2013 21:02:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 21:02:08 +0000 X-ASF-Spam-Status: No, hits=2.7 required=5.0 tests=FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_REPLY,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of cmanalyst66@gmail.com designates 209.85.128.47 as permitted sender) Received: from [209.85.128.47] (HELO mail-qe0-f47.google.com) (209.85.128.47) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 21:02:04 +0000 Received: by mail-qe0-f47.google.com with SMTP id 1so1981172qec.6 for ; Mon, 17 Jun 2013 14:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=0uko/LHqy8UKKcDDAOlV3AVl6jGhuXDQHOnFOj2dM/w=; b=YiKACLe7JfZNm8UvZ9zh+sassGrIGqRGKabBD+xroD9udqZHpw7XBEJIWvnvUnw9gJ jvxRZdhtzGLdA89PXrJz0CswMRbAuNKbCdhEGt+rDBww5KK7w83eFkMRuqiR9Jj2EmWJ h1AG4dhYh5RLq6HAB2UC1xhPmjCzNOw5R5E2DscOODKakdBye0MGsahd5x9ofNgyXkkH wK6pVwve8GUzbn5Df9lkNF0w65aZzdBrJx0dI0ESTjCzyDegttWDYtMvjDLcn7wRHbi2 i0FpAx5Nv00RdQhQeKW/OVhciyPDetUTAPA6OOMn3vOhGtSYPSuIXtWWv8xi6eweUad0 Cz9w== MIME-Version: 1.0 X-Received: by 10.229.165.207 with SMTP id j15mr3286102qcy.92.1371502903351; Mon, 17 Jun 2013 14:01:43 -0700 (PDT) Received: by 10.49.50.68 with HTTP; Mon, 17 Jun 2013 14:01:43 -0700 (PDT) In-Reply-To: References: <51BF2D68.2090100@collab.net> <1B05D8F50421E24799AE93B03CC284BE01C5AFF08A@CRPMBX01.corp.cbeyond.net> Date: Mon, 17 Jun 2013 16:01:43 -0500 Message-ID: Subject: Re: Ancestrally Related Error Message From: C M To: Les Mikesell Cc: Andrew Reedick , "C. Michael Pilato" , Subversion Content-Type: multipart/alternative; boundary=f46d04446ac15cde6404df5fe78d X-Virus-Checked: Checked by ClamAV on apache.org --f46d04446ac15cde6404df5fe78d Content-Type: text/plain; charset=ISO-8859-1 Well, for what its worth, I was able to complete the "merge" following steps 3 -6 in this article. http://kirenpillay.blogspot.com/2012/07/svn-merge-tree-conflict-resolution.html I don't understand why SVN behaved the way it did and prevented the branch to trunk merge as expected.. On Mon, Jun 17, 2013 at 1:47 PM, Les Mikesell wrote: > On Mon, Jun 17, 2013 at 12:59 PM, C M 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 > --f46d04446ac15cde6404df5fe78d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Well, for what its worth, I was able to complete the = "merge" following steps 3 -6 in this article.

http://kirenpillay.blogspot.com/2012/07/svn-merge-tree-conflict-= resolution.html

I don't understand why SVN behaved the way it did and prevented the= branch to trunk merge as expected..





On Mon, Jun 17, 2013 at 1:47 = PM, Les Mikesell <lesmikesell@gmail.com> wrote:
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
> =A0M =A0 =A0 =A0.
> ! =A0 =A0 C MMI
> =A0 =A0 =A0 > =A0 local delete, incoming edit upon merge
[...]

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

--
=A0 =A0Les Mikesell
=A0 =A0 =A0lesmikesell@gmail.com

--f46d04446ac15cde6404df5fe78d--