/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-07-13 00:34:53 UTC
  • mfrom: (7027.3.8 python3-n)
  • Revision ID: breezy.the.bot@gmail.com-20180713003453-3wofrh7brng5jz3l
Add some more bees; support writing both bytes and unicode strings in build_tree_contents.

Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1055
1055
                parent_ids.extend(merge_parents)
1056
1056
        if self._tree.get_revision_id() != last_rev_id:
1057
1057
            raise ValueError('TreeTransform not based on branch basis: %s' %
1058
 
                             self._tree.get_revision_id())
 
1058
                             self._tree.get_revision_id().decode('utf-8'))
1059
1059
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
1060
1060
        builder = branch.get_commit_builder(parent_ids,
1061
1061
                                            timestamp=timestamp,