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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
182
182
 
183
183
 
184
184
def do_directory(tt, trans_id, tree, relative_path, path):
185
 
    if isdir(path) and tree.path2id(relative_path) is not None:
 
185
    if isdir(path) and tree.is_versioned(relative_path):
186
186
        tt.cancel_deletion(trans_id)
187
187
    else:
188
188
        tt.create_directory(trans_id)