Ahhh, ok, that makes sense. Mike
2009/10/23 Uwe Schindler <u...@thetaphi.de>: > Ist very easy to explain: > > The mergeinfo is inherited from top level directories downto each file. If > one of the files already contained a mergeinfo in its properties (e.g. the > TestBackwardsCompatibility), because it was merged separately (I > reverse-merged this test as a separate action during my initial test > editing, you know it was deleted). This file-specific mergeinfo overrides > the one from the directoy. > > If you then add a new mergeinfo to a top-level directoy (like you did), the > files/subdirs with a separate mergeinfo need to be updated, too. Because of > this you see the spurious mergeinfos in unchanged files. > > Uwe > > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: u...@thetaphi.de > >> -----Original Message----- >> From: Michael McCandless [mailto:luc...@mikemccandless.com] >> Sent: Friday, October 23, 2009 10:19 PM >> To: java-dev@lucene.apache.org >> Subject: Re: svn:mergeinfo prop >> >> OK thanks for the pointer :) It's very strange indeed. >> >> Mike >> >> On Fri, Oct 23, 2009 at 2:12 PM, Earwin Burrfoot <ear...@gmail.com> wrote: >> > 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.fin >> alword >> > >> > On Fri, Oct 23, 2009 at 21:55, Michael McCandless >> > <luc...@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/TestBack >> wardsCompatibility.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/TestN >> umberTools.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-unsubscr...@lucene.apache.org >> >> For additional commands, e-mail: java-dev-h...@lucene.apache.org >> >> >> >> >> > >> > >> > >> > -- >> > Kirill Zakharenko/Кирилл Захаренко (ear...@gmail.com) >> > Home / Mobile: +7 (495) 683-567-4 / +7 (903) 5-888-423 >> > ICQ: 104465785 >> > >> > --------------------------------------------------------------------- >> > To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org >> > For additional commands, e-mail: java-dev-h...@lucene.apache.org >> > >> > >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org >> For additional commands, e-mail: java-dev-h...@lucene.apache.org > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org > For additional commands, e-mail: java-dev-h...@lucene.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org For additional commands, e-mail: java-dev-h...@lucene.apache.org
