Rev 1736: Ignore tags that happen to be files. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1736
revision-id: jelmer at samba.org-20081103122956-lf4burdm680nfuy1
parent: jelmer at samba.org-20081103034353-5ez9e3g8dzullsj9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-03 13:29:56 +0100
message:
  Ignore tags that happen to be files.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'NEWS'
--- a/NEWS	2008-11-03 02:15:04 +0000
+++ b/NEWS	2008-11-03 12:29:56 +0000
@@ -11,6 +11,8 @@
 
    * Fix python2.6 deprecation warnings. (#292306)
 
+   * Ignore with tags that happen to be files. (#290664)
+
 bzr-svn 0.4.13	2008-09-24
 
   BUG FIXES

=== modified file 'repository.py'
--- a/repository.py	2008-09-01 13:51:09 +0000
+++ b/repository.py	2008-11-03 12:29:56 +0000
@@ -872,7 +872,10 @@
                                 tr = int(self.transport.get_dir(cf, cr)[2][properties.PROP_ENTRY_COMMITTED_REV])
                             tags[p] = self.generate_revision_id(tr, tp, mapping)
                         else:
-                            tags[bp] = self.generate_revision_id(revnum, bp, mapping, revprops=revprops)
+                            try:
+                                tags[bp] = self.generate_revision_id(revnum, bp, mapping, revprops=revprops)
+                            except SubversionException, (_, errors.ERR_FS_NOT_DIRECTORY):
+                                pass
         finally:
             pb.finished()