← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.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
 
18
18
from bzrlib import errors, inventory, osutils
140
140
        # perhaps a bit questionable but seems like the most reasonable thing...
141
141
        self.assertChangeDescription('unchanged', None, None)
142
142
 
143
 
        # in this case it's both renamed and modified; show a rename and 
 
143
        # in this case it's both renamed and modified; show a rename and
144
144
        # modification:
145
145
        new_a.name = 'newfilename'
146
146
        self.assertChangeDescription('modified and renamed', old_a, new_a)