Mailing-List: contact java-dev-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: java-dev@lucene.apache.org
Received-SPF: pass (nike.apache.org: domain of earwin@gmail.com designates
 74.125.78.27 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type:content-transfer-encoding;
        b=fJ2WQr18pc4V9NSucM79tGJQ7L5I693XCCRucLvZnr7a/T9qWHtZtZJCJpeIL7Exd4
         fBLxjHDjVKUBxFDaAt6+/nu8sg8J811Am+cCs5/1FQXyhzv1llNgLgrqt6Z6SBKAvafo
         Osz5xNcC1KtSUs7z36bo2R0cB2OqdtrR3gOIc=
MIME-Version: 1.0
In-Reply-To: <9ac0c6aa0910231055s38845a83xa6afcbd49c2aaeb5@mail.gmail.com>
References: <9ac0c6aa0910231055s38845a83xa6afcbd49c2aaeb5@mail.gmail.com>
Date: Fri, 23 Oct 2009 22:12:11 +0400
Message-ID: <59b3eb370910231112k75bcab7ble7d5be43d5a305ea@mail.gmail.com>
Subject: Re: svn:mergeinfo prop
From: Earwin Burrfoot <earwin@gmail.com>
To: java-dev@lucene.apache.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

It's okay in a sense.
See, svn's merge-tracking support was grafted onto it in a particulary
hideous way and is really hairy on the insides.
So while there's no sane explanation for that behaviour, it is expected.

See - http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.=
branchmerge.advanced.finalword

On Fri, Oct 23, 2009 at 21:55, Michael McCandless
<lucene@mikemccandless.com> wrote:
> I've noticed recently when merging from 2.9.x -> trunk or vice/versa,
> for some reason it picks up files that had zero source changes in the
> revision I merged, but do show changes to their svn:mergeinfo.
>
> EG for LUCENE-2002, I merged 2.9.x -> trunk, and now on my trunk
> checkout I see this mods:
>
> Property changes on:
> src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
> ___________________________________________________________________
> Modified: svn:mergeinfo
> =C2=A0 Merged /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene=
/index/TestBackwardsCompatibility.java:r829134
>
>
> Property changes on: src/test/org/apache/lucene/document/TestNumberTools.=
java
> ___________________________________________________________________
> Modified: svn:mergeinfo
> =C2=A0 Merged /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene=
/document/TestNumberTools.java:r829134
>
> But, the commit for LUCENE-2002 did not touch these files. =C2=A0Does
> anyone know why it's doing this? =C2=A0Is it OK?
>
> Mike
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org
>
>


--=20
Kirill Zakharenko/=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB =D0=97=D0=B0=D1=85=
=D0=B0=D1=80=D0=B5=D0=BD=D0=BA=D0=BE (earwin@gmail.com)
Home / Mobile: +7 (495) 683-567-4 / +7 (903) 5-888-423
ICQ: 104465785

---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org