Error reporting improvement

Apologies for offloading more of the work onto the devs than
is
generally considered polite here, but I'm short on time to
devote to
this.  So:

When a file contains a vendor branch and also a revision
1.2, the
recorded fatal error does not currently mention the
filename.  Here's
an updated code fragment for circa line 715 of
cvs2svn_lib/collect_data.py to record the filename:

        self.collect_data.record_fatal_error(
            "File '%s' has default branch=%s but also a
revision %s"
            % (self.cvs_file.filename, self.default_branch,
rev_1_2.rev,)
            )

(Why do I have files like that?  In my CVS repository, when
I stopped
needing a local modification to an imported file, I used to
reset the
default branch to 1.1.1 so that CVS would stop duplicating
all of the
vendor changes onto the trunk for every import.  I later
realized that
was a bad idea and stopped doing it, but the files are still
there.
I'll have to repair them somehow.)

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org

Greg Hudson wrote:
> When a file contains a vendor branch and also a
revision 1.2, the
> recorded fatal error does not currently mention the
filename.  Here's
> an updated code fragment for circa line 715 of
> cvs2svn_lib/collect_data.py to record the filename:
> 
>         self.collect_data.record_fatal_error(
>             "File '%s' has default branch=%s but
also a revision %s"
>             % (self.cvs_file.filename,
self.default_branch, rev_1_2.rev,)
>             )

Thanks for the suggestion.  Committed on trunk as r27161. 
(Please note
that this code has moved, so the modification is to
cvs2svn_lib/cvs_file_items.py.)

Michael

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org