← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-07 10:56:19 UTC
  • mfrom: (6011.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110707105619-6tftefqyt2zlmho5
(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
82
82
            # when a tree root was deleted / renamed.
83
83
            if kind[0] is None and names[1] == '':
84
84
                continue
 
85
            # Also don't shelve deletion of tree root.
 
86
            if kind[1] is None and names[0] == '':
 
87
                continue
85
88
            if kind[0] is None or versioned[0] == False:
86
89
                self.creation[file_id] = (kind[1], names[1], parents[1],
87
90
                                          versioned)