/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/shelf.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
266
266
            to_transform.adjust_path(name, s_parent_id, s_trans_id)
267
267
            if existing_path is None:
268
268
                if kind is None:
269
 
                    to_transform.create_file('', s_trans_id)
 
269
                    to_transform.create_file([b''], s_trans_id)
270
270
                else:
271
271
                    transform.create_from_tree(
272
272
                            to_transform, s_trans_id, tree,