/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-04-01 17:57:39 UTC
  • mfrom: (6929.3.3 skip-root-simpler)
  • Revision ID: breezy.the.bot@gmail.com-20180401175739-36i4k9x17dx3wsu7
Some miscellaneous changes (check for actual root, add Tree.versionable_kind).

Merged from https://code.launchpad.net/~jelmer/brz/skip-root-simpler/+merge/342451

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
657
657
            if kind is None:
658
658
                conflicts.append(('versioning no contents', trans_id))
659
659
                continue
660
 
            if not inventory.InventoryEntry.versionable_kind(kind):
 
660
            if not self._tree.versionable_kind(kind):
661
661
                conflicts.append(('versioning bad kind', trans_id, kind))
662
662
        return conflicts
663
663