← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

(gz) Create working tree at specified revision when doing a local push
 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
535
535
        else:
536
536
            # TODO now merge from tree.last_revision to revision (to preserve
537
537
            # user local changes)
538
 
            merge.transform_tree(tree, self)
 
538
            try:
 
539
                other_tree = self.revision_tree(revision_id)
 
540
            except errors.NoSuchRevision:
 
541
                other_tree = self.branch.repository.revision_tree(revision_id)
 
542
 
 
543
            merge.transform_tree(tree, other_tree)
539
544
            if revision_id == _mod_revision.NULL_REVISION:
540
545
                new_parents = []
541
546
            else: