                                 8 6))
           (dir-set '("."))
           (externals-map (make-hash-table :test 'equal))
-          (next-is-first-line-of-external-list nil))
+          (skip-double-external-dir-entry-name nil))
       (set-buffer svn-process-buffer-name)
       (setq svn-status-info nil)
       (run-hooks 'svn-pre-parse-status-hook)

          (setq revision-width (max revision-width
                                    (length (number-to-string local-rev))
                                    (length (number-to-string last-change-rev))))
          (setq author-width (max author-width (length author)))
          (setq next-is-first-line-of-external-list nil)))
        (forward-line 1))
      (unless svn-status-verbose
        (setq svn-status-info (svn-status-make-dummy-dirs dir-set

          ;; so we should merge lines 'X dir' with ' dir', but for now
          ;; we just leave both in the results

          ;; My attempt to merge the lines uses skip-double-external-dir-entry-name
          ;; and externals-map
          (setq skip-double-external-dir-entry-name (match-string-no-properties 1))
          ;; (message "Going to skip %s" skip-double-external-dir-entry-name)
          nil)
         (t
          (setq svn-marks (buffer-substring (point) (+ (point) svn-marks-length))
