*** empty log message ***

direct/src/distributed/ClientRepository.py

@@ -28,7 +28,7 @@ class ClientRepository(DirectObject.DirectObject):
 
     def parseDcFile(self, dcFileName):
         self.dcFile = DCFile()
-        self.dcFile.read(dcFileName)
+        assert(self.dcFile.read(dcFileName))
         return self.parseDcClasses(self.dcFile)
 
     def parseDcClasses(self, dcFile):

direct/src/interval/IntervalTest.py

@@ -23,16 +23,10 @@ BOAT_END = boatTrack.getIntervalEndTime('boatpath')
 
 # Make the dock lerp up so that it's up when the boat reaches the end of
 # its mopath
-<<<<<<< IntervalTest.py
 dockLerp = LerpPosHprInterval('lerp', dock,
                               Point3(0, 0, -5),
                               hpr = Vec3(0, 0, 0),
                               5.0)
-=======
-pos = Point3(0, 0, -5)
-hpr = Vec3(0, 0, 0)
-dockLerp = LerpPosHprInterval(dock, 5.0, pos, hpr, name='dock-lerp')
->>>>>>> 1.12
 # We need the dock's state to be defined before the lerp
 dockPos = PosHprInterval(dock, dock.getPos(), dock.getHpr(), 1.0, 'dockpos')
 dockUpTime = BOAT_END - dockLerp.getDuration()