Rev 2459: Tests now pass in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/rename_iter_changes_109993
John Arbash Meinel
john at arbash-meinel.com
Wed Apr 25 23:07:21 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/rename_iter_changes_109993
------------------------------------------------------------
revno: 2459
revision-id: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
parent: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:07:09 -0500
message:
Tests now pass
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-04-20 20:39:53 +0000
+++ b/bzrlib/workingtree_4.py 2007-04-25 22:07:09 +0000
@@ -2294,7 +2294,11 @@
# this check should probably be outside the loop: one
# 'iterate two trees' api, and then _iter_changes filters
# unchanged pairs. - RBC 20070226
- path_handled = True
+ if current_entry[1][target_index][0] == 'a':
+ advance_path = False
+ path_handled = False
+ else:
+ path_handled = True
if (include_unchanged
or result[2] # content change
or result[3][0] != result[3][1] # versioned status
More information about the bazaar-commits
mailing list