Rev 297: Warn when noticing directories being upgraded to branches, as that'll most likely create trouble. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Tue Dec 26 00:28:31 GMT 2006


------------------------------------------------------------
revno: 297
revision-id: jelmer at samba.org-20061226002708-dpl9ryphuyi9i63v
parent: jelmer at samba.org-20061226001231-vfnun5usqacz9wqy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2006-12-26 01:27:08 +0100
message:
  Warn when noticing directories being upgraded to branches, as that'll most likely create trouble.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
=== modified file 'logwalker.py'
--- a/logwalker.py	2006-12-25 17:12:14 +0000
+++ b/logwalker.py	2006-12-26 00:27:08 +0000
@@ -219,9 +219,13 @@
                 not revpaths[branch_path][1] is None):
                 # In this revision, this branch was copied from 
                 # somewhere else
-                # FIXME: What if copyfrom_path is not a branch path?
                 continue_revnum = revpaths[branch_path][2]
+                # FIXME: if copyfrom_path is not a branch path, 
+                # should simulate a reverse "split" of a branch
                 branch_path = revpaths[branch_path][1]
+                if not self.scheme.is_branch(branch_path):
+                    warn('directory %r:%d upgraded to branch in %d. This is not currently supported.' % 
+                            (branch_path, continue_revnum, i))
 
     def find_branches(self, revnum):
         """Find all branches that were changed in the specified revision number.




More information about the bazaar-commits mailing list