← Back to branch summary

~ubuntu-branches/ubuntu/lucid/bzr/lucid-proposed

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Bazaar Package Importer
  • Author(s): John Francesco Ferlito, Andrew Starr-Bochicchio, John Francesco Ferlito
  • Date: 2010-01-25 19:53:02 UTC
  • mfrom: (1.4.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100125195302-zfywpdezvs3eqehj
[ Andrew Starr-Bochicchio ]
* debian/control: Fix obsolete-relation-form-in-source
  lintian warning. 

[ John Francesco Ferlito ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1624
1624
                                this_tree=self,
1625
1625
                                pb=pb,
1626
1626
                                change_reporter=change_reporter)
1627
 
                    if (basis_tree.inventory.root is None and
1628
 
                        new_basis_tree.inventory.root is not None):
1629
 
                        self.set_root_id(new_basis_tree.get_root_id())
 
1627
                    basis_root_id = basis_tree.get_root_id()
 
1628
                    new_root_id = new_basis_tree.get_root_id()
 
1629
                    if basis_root_id != new_root_id:
 
1630
                        self.set_root_id(new_root_id)
1630
1631
                finally:
1631
1632
                    pb.finished()
1632
1633
                    basis_tree.unlock()
2245
2246
            basis.lock_read()
2246
2247
            try:
2247
2248
                to_tree = self.branch.basis_tree()
2248
 
                if basis.inventory.root is None:
2249
 
                    self.set_root_id(to_tree.get_root_id())
 
2249
                to_root_id = to_tree.get_root_id()
 
2250
                if (basis.inventory.root is None
 
2251
                    or basis.inventory.root.file_id != to_root_id):
 
2252
                    self.set_root_id(to_root_id)
2250
2253
                    self.flush()
2251
2254
                result += merge.merge_inner(
2252
2255
                                      self.branch,