2 problems making JDK7

[Howard Lovatt]

Hi,

When I try and make JDK7 I get 2 errors:

1. Conflict during merge:

warning: conflicts during merge.
merging .hgtags failed!
warning: detected divergent renames of
test/tools/javac/tree/TreeScannerTest.java to:
 test/tools/javac/tree/AbstractTreeScannerTest.java
 test/tools/javac/tree/JavacTreeScannerTest.java
 test/tools/javac/tree/SourceTreeScannerTest.java
363 files updated, 0 files merged, 5 files removed, 1 files unresolved


2. Compilation error:

    [javac] /Users/lov080/Downloads/MLVM/JDK7/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java:372:
method does not override or implement a method from a supertype
    [javac]             @Override
    [javac]             ^
    [javac] 1 error

BUILD FAILED
/Users/lov080/Downloads/MLVM/JDK7/langtools/make/build.xml:413: The
following error occurred while executing this line:
/Users/lov080/Downloads/MLVM/JDK7/langtools/make/build.xml:777:
Compile failed; see the compiler error output for details.


I am making on a Mac - details of build:

http://mail.openjdk.java.net/pipermail/lambda-dev/2010-September/002434.html

Cheers,

  -- Howard.