[BUG][dirstate] bzr status with a renamed file
John Arbash Meinel
john at arbash-meinel.com
Fri Apr 27 21:10:00 BST 2007
I just did "mv bar bar2" in a project of mine without doing "bzr mv bar
bar2".
"bzr status" then reported that bar was missing, but didn't tell me that
'bar2' was unknown.
I think the bug is again in _iter_changes. Most likely it finds both
names at the same times (the only other file is __init__.py), and it
considers them both "handled" at the same time. Rather than not
synchronizing and issuing 2 entries.
Either that or it is just considering "path_handled" at the wrong time.
My initial guess is that this is the culprit:
=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py 2007-04-25 22:07:09 +0000
+++ bzrlib/workingtree_4.py 2007-04-27 20:09:09 +0000
@@ -2268,7 +2268,7 @@
# 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
+ #path_handled = True
if (include_unchanged
or result[2] #
content change
or result[3][0] != result[3][1] #
versioned status
John
=:->
affects /products/bzr
status confirmed
priority high
More information about the bazaar
mailing list