← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_paths2ids.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_paths2ids.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for WorkingTree.paths2ids.
18
18
 
24
24
from operator import attrgetter
25
25
 
26
26
from bzrlib import errors
27
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
27
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
28
28
 
29
29
 
30
30
# TODO: This needs an additional test: do a merge, then do a
91
91
        """Check the basic nasty corner case that path2ids should handle.
92
92
 
93
93
        This is the following situation:
94
 
        basis: 
 
94
        basis:
95
95
          / ROOT
96
96
          /dir dir
97
97
          /dir/child-moves child-moves
118
118
          child-stays either because its under newdir/dir in current, or under dir in old
119
119
          child-goes because its under dir in old.
120
120
          new-child because its under dir in new
121
 
        
 
121
 
122
122
        Symmetrically, current_tree.path2ids(['dir'], [basis]) is meant to show
123
123
        new-child, even though its not under the path 'dir' in current, because
124
124
        its under a path selected by 'dir' in basis: