diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-21 15:21:00 +0100 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-21 15:21:00 +0100 |
| commit | 0321df7292018d1e7408ef9ad193c8fc7bf4765d (patch) | |
| tree | 6152d94c2b614bb823f75d864c2a729e8221248a /test/files/buildmanager | |
| parent | 13a325b126ac6f2f5d2e7d1fc2c008d012367430 (diff) | |
| parent | f6c050e8cfa5bd1ee4bbb3434086d2ae2d35e5f7 (diff) | |
| download | scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.tar.gz scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.tar.bz2 scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.zip | |
Merge branch 'master' into feature/pc-execution-contexts
Diffstat (limited to 'test/files/buildmanager')
| -rw-r--r-- | test/files/buildmanager/t2556_3/t2556_3.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/buildmanager/t2556_3/t2556_3.check b/test/files/buildmanager/t2556_3/t2556_3.check index bf26602494..37808d2b31 100644 --- a/test/files/buildmanager/t2556_3/t2556_3.check +++ b/test/files/buildmanager/t2556_3/t2556_3.check @@ -3,8 +3,8 @@ compiling Set(A.scala, B.scala, C.scala) Changes: Map() builder > A.scala compiling Set(A.scala) -Changes: Map(class A -> List(), class B -> List(Changed(Class(B))[List((A,Object), (ScalaObject,ScalaObject))])) -invalidate C.scala because parents have changed [Changed(Class(B))[List((A,Object), (ScalaObject,ScalaObject))]] +Changes: Map(class A -> List(), class B -> List(Changed(Class(B))[List((A,Object))])) +invalidate C.scala because parents have changed [Changed(Class(B))[List((A,Object))]] invalidate B.scala because it references invalid (no longer inherited) definition [ParentChanged(Class(C))] compiling Set(B.scala, C.scala) B.scala:3: error: type mismatch; |