/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 bzrlib/tests/workingtree_implementations/test_paths2ids.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-25 14:36:59 UTC
  • mfrom: (4048 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4049.
  • Revision ID: jelmer@samba.org-20090225143659-vx6cbqtmyicuzfyf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_paths2ids.py
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: