lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Earwin Burrfoot <ear...@gmail.com>
Subject Re: svn:mergeinfo prop
Date Fri, 23 Oct 2009 18:12:11 GMT
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
>   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
>   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.  Does
> anyone know why it's doing this?  Is it OK?
>
> Mike
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org
>
>



-- 
Kirill Zakharenko/Кирилл Захаренко (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


Mime
View raw message