In cases like this, i would recommend merging from the root of your checkout (branch_3x/)
Otherwise when merging from individual files or directories, this adds merge props to them (in this case lucene/dev/branches/branch_3x/lucene/contrib/misc/). On Sun, Nov 28, 2010 at 5:19 PM, <[email protected]> wrote: > Author: koji > Date: Sun Nov 28 22:19:23 2010 > New Revision: 1039963 > > URL: http://svn.apache.org/viewvc?rev=1039963&view=rev > Log: > LUCENE-2393: fix package name in usage message > > Modified: > lucene/dev/branches/branch_3x/lucene/contrib/misc/ (props changed) > > lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/GetTermInfo.java > > Modified: > lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/GetTermInfo.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/GetTermInfo.java?rev=1039963&r1=1039962&r2=1039963&view=diff > ============================================================================== > --- > lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/GetTermInfo.java > (original) > +++ > lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/GetTermInfo.java > Sun Nov 28 22:19:23 2010 > @@ -58,6 +58,6 @@ public class GetTermInfo { > private static void usage() { > System.out > .println("\n\nusage:\n\t" > - + "java org.apache.lucene.index.GetTermInfo <index dir> field > term \n\n"); > + + "java org.apache.lucene.misc.GetTermInfo <index dir> field > term \n\n"); > } > } > > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
