Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of jcorvel@gmail.com designates
 209.85.210.171 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :cc:content-type:content-transfer-encoding;
        b=fwHM/W638kmsP1fzy6hPtUXlDIsZRcA7ne+RRH4t2KBlESzknIOo73SzGgYdxnHoyw
         tJxMo+SpfK4VZnnb4hraRwq0KZCBuNE4Kvh+w9FAnreXt5wfbnxKXIHxvUNdIWdu7j+Y
         i7XCQGxjtEFsWJ9CIP45t+gxKSyEnT9xvUj4E=
MIME-Version: 1.0
In-Reply-To: <20110102183616.GA21078@daniel3.local>
References: <20110102183616.GA21078@daniel3.local>
From: Johan Corveleyn <jcorvel@gmail.com>
Date: Sun, 2 Jan 2011 20:13:59 +0100
Message-ID: <AANLkTi=RNs462CTuaTrp=U2sAGCPMDqu9YKb=NKB5O-x@mail.gmail.com>
Subject: Re: -bytes branch reports bogus conflict that trunk doesn't
To: Daniel Shahaf <danielsh@apache.org>
Cc: dev@subversion.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf <danielsh@apache.org> wrote:
> Johan,
>
> I saw your sync merge, so I ran 'svn up' with intent to rebuild. =A0When
> I ran that 'up' with the branch build, I got a conflict, which didn't
> appear when I ran it with a trunk build. =A0(See attached transcript.)

Did you do that with a build of HEAD of diff-optimizations-bytes (i.e.
only changes to diff2 behavior)? Or with a build where the patch for
diff3 was applied?

Johan

> Furthermore, the conflict resolution (a) marked all the head of the file
> as conflict (which is wrong; line 49 did change, but the first
> 20-something lines are identical), and (b) deleted everything after
> line 232.
>
> I realize that (a) is an outstanding issue (discussed in another thread
> this weekend), but I don't recall that (b) is a known issue.
>
> Daniel
>
>