From 7e464458f8035aba05666f639df6fb5adc6572a2 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 21 Jul 2015 17:13:16 -0700
Subject: [PATCH] Accepted baselines.

---
 .../defaultExportsCannotMerge02.errors.txt    | 38 +++++++++++++++++
 .../reference/defaultExportsCannotMerge02.js  | 41 +++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
 create mode 100644 tests/baselines/reference/defaultExportsCannotMerge02.js

diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt b/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
new file mode 100644
index 00000000000..52e00547a89
--- /dev/null
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
@@ -0,0 +1,38 @@
+tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
+tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
+tests/cases/conformance/es6/modules/m2.ts(8,13): error TS2339: Property 'p1' does not exist on type 'Decl'.
+tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' does not exist on type 'Decl'.
+
+
+==== tests/cases/conformance/es6/modules/m1.ts (0 errors) ====
+    
+    export default class Decl {
+    }
+    
+    export interface Decl {
+        p1: number;
+        p2: number;
+    }
+    
+    export namespace Decl {
+        interface I {
+        }
+    }
+    
+==== tests/cases/conformance/es6/modules/m2.ts (4 errors) ====
+    import Entity from "m1"
+    
+    Entity();
+    ~~~~~~~~
+!!! error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
+    
+    var x: Entity;
+    var y: Entity.I;
+           ~~~~~~
+!!! error TS2503: Cannot find namespace 'Entity'.
+    var z = new Entity();
+    var sum = z.p1 + z.p2
+                ~~
+!!! error TS2339: Property 'p1' does not exist on type 'Decl'.
+                       ~~
+!!! error TS2339: Property 'p2' does not exist on type 'Decl'.
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
new file mode 100644
index 00000000000..72a8e3c5f1d
--- /dev/null
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -0,0 +1,41 @@
+//// [tests/cases/conformance/es6/modules/defaultExportsCannotMerge02.ts] ////
+
+//// [m1.ts]
+
+export default class Decl {
+}
+
+export interface Decl {
+    p1: number;
+    p2: number;
+}
+
+export namespace Decl {
+    interface I {
+    }
+}
+
+//// [m2.ts]
+import Entity from "m1"
+
+Entity();
+
+var x: Entity;
+var y: Entity.I;
+var z = new Entity();
+var sum = z.p1 + z.p2
+
+//// [m1.js]
+var Decl = (function () {
+    function Decl() {
+    }
+    return Decl;
+})();
+exports.default = Decl;
+//// [m2.js]
+var m1_1 = require("m1");
+m1_1.default();
+var x;
+var y;
+var z = new m1_1.default();
+var sum = z.p1 + z.p2;