--- /usr/ports/devel/subversion/work/subversion-0.31.0/tools/cvs2svn/cvs2svn.py	Wed Oct  8 17:34:16 2003
+++ /usr/local/bin/cvs2svn.py	Mon Oct 13 13:44:54 2003
@@ -485,14 +485,26 @@
 
   def _stabilize_directory(self, key):
     """Close the directory whose node key is KEY."""
-    dir = marshal.loads(self.nodes_db[key])
+    try:
+      dir = marshal.loads(self.nodes_db[key])
+    except:
+      print "xxxx key: %s" % key
+      #print "xxxx self.nodes_db.keys(): %s" % self.nodes_db.keys()
+      raise
     if dir.has_key(self.mutable_flag):
       del dir[self.mutable_flag]
       if dir.has_key(self.approved_entries):
         del dir[self.approved_entries]
       for entry_key in dir.keys():
         if not entry_key[0] == '/':
-          self._stabilize_directory(dir[entry_key])
+          try:
+            self._stabilize_directory(dir[entry_key])
+          except:
+            print "XXXX entry_key: %s" % entry_key
+            print "XXXX for entry_key in dir.keys():"
+            for entry_key in dir.keys():
+              print "XXX entry_key: %s" % entry_key
+            raise
       self.nodes_db[key] = marshal.dumps(dir)
 
   def stabilize_youngest(self):
@@ -1812,7 +1824,14 @@
       cvs_path = relative_name(ctx.cvsroot, rcs_file[:-2])
       svn_path = make_path(ctx, cvs_path, br)
       if svn_rev == SVN_INVALID_REVNUM:
-        svn_rev = dumper.start_revision(props)
+        try:
+          svn_rev = dumper.start_revision(props)
+        except:
+          print "XXXXX rcs_file: %s" % rcs_file
+          print "XXXXX cvs_rev:  %s" % cvs_rev
+          print "XXXXX cvs_path: %s" % cvs_path
+          print "XXXXX props:    %s" % props
+          raise
       sym_tracker.enroot_tags(svn_path, svn_rev, tags)
       sym_tracker.enroot_branches(svn_path, svn_rev, branches)
       if br: