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-unsubscr...@lucene.apache.org For additional commands, e-mail: java-dev-h...@lucene.apache.org
