Merge some fixes from 0.3 branch.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Apr 2007 16:15:53 +0000 (18:15 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Apr 2007 16:15:53 +0000 (18:15 +0200)
1  2 
NEWS
TODO
checkout.py
convert.py
format.py
tests/test_checkout.py
tests/test_commit.py
tests/test_convert.py

diff --cc NEWS
Simple merge
diff --cc TODO
index 1abc7e2cdc897b96fca73edb0836f26ed80b8ab4,5d2317a1c307ad770e6fc968bdda20e023d524eb..ccf6a8369fd51acafee5d7a023f201eb63fd8f7e
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -1,5 -1,6 +1,6 @@@
+ - rename 'main' to 0.4
  - simplify find_branches by using Transport.list_dir() ?
 -- make scheme name part of revision id / support multiple branching schemes per repository
 +- replace 'undefined' by scheme name in revision ids
  - fix commits in heavyweight checkouts somehow
  - fix autorealm repository
  - handle parent directories of branches being moved correctly
diff --cc checkout.py
index 9bc5986894b5fda3602f6ed4f592de1bfd60b2c8,ac927dfd5cab98f5ec18c942bd0b9be628645c71..99d06afb6dcbcf414e0596a34ccf411cfe19fcbd
@@@ -628,10 -633,10 +629,10 @@@ class SvnCheckout(BzrDir)
          self.branch_path = svn_url[len(bzr_to_svn_url(self.svn_root_transport.base)):]
          self.scheme = BranchingScheme.guess_scheme(self.branch_path)
          mutter('scheme for %r is %r' % (self.branch_path, self.scheme))
 -        if not self.scheme.is_branch(self.branch_path):
 +        if not self.scheme.is_branch(self.branch_path) and not self.scheme.is_tag(self.branch_path):
              raise NotBranchError(path=self.transport.base)
  
-     def clone(self, path, revision_id=None, basis=None, force_new_repo=False):
+     def clone(self, path, revision_id=None, force_new_repo=False):
          raise NotImplementedError(self.clone)
  
      def open_workingtree(self, _unsupported=False):
diff --cc convert.py
index 1cb67b0ba6307a8b3b68a1be0ae8bce51cfd766a,c19d8e89bd9bb9c731a60018a73546c9e16d6c9a..a1c1851b809f5c5d71853e7a034295914a7f68f7
@@@ -134,16 -132,9 +134,16 @@@ def convert_repository(url, output_url
                      target_branch = target_dir.open_branch()
                  except NotBranchError:
                      target_branch = target_dir.create_branch()
+                     target_branch.set_parent(source_branch_url)
                  if not revid in target_branch.revision_history():
-                     source_branch = Branch.open(urlutils.join(url, branch))
+                     source_branch = Branch.open(source_branch_url)
 +                    # Check if target_branch contains a subset of 
 +                    # source_branch. If that is not the case, 
 +                    # assume that source_branch has been replaced 
 +                    # and remove target_branch
 +                    if not target_branch.last_revision() in \
 +                            source_branch.revision_history():
 +                        target_branch.set_revision_history([])
                      target_branch.pull(source_branch)
                  if working_trees and not target_dir.has_workingtree():
                      target_dir.create_workingtree()
diff --cc format.py
Simple merge
Simple merge
Simple merge
Simple merge