Rev 1603: Avoid importing tags as branches in svn-import. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1603
revision-id: jelmer at samba.org-20080822162240-5k1x6t714qwgify4
parent: jelmer at samba.org-20080822161601-qz3m031chc01xm32
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-08-22 18:22:40 +0200
message:
  Avoid importing tags as branches in svn-import.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
=== modified file 'NEWS'
--- a/NEWS	2008-08-22 16:13:03 +0000
+++ b/NEWS	2008-08-22 16:22:40 +0000
@@ -12,6 +12,9 @@
 
    * Parse http redirect errors in some non-English locales better.
 
+   * Avoid importing tags as branches in svn-import, now that tags are 
+     converted to native Bazaar tags.
+
   FEATURES
 
    * svn-import will now remove branches removed in Subversion. 

=== modified file 'convert.py'
--- a/convert.py	2008-08-22 16:16:01 +0000
+++ b/convert.py	2008-08-22 16:22:40 +0000
@@ -179,7 +179,7 @@
         for (bp, revnum, exists) in changed_branches:
             if not exists and not keep:
                 removed_branches.append((bp, revnum))
-            elif exists:
+            elif exists and layout.is_branch(bp):
                 try:
                     existing_branches.append(SvnBranch(source_repos, bp))
                 except NotBranchError: # Skip non-directories