[Pkg-bazaar-commits] ./bzr/unstable r93: Fix inverted display of 'R' and 'M' during 'commit -v'

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 93
committer: mbp at sourcefrog.net
timestamp: Fri 2005-03-25 14:47:50 +1100
message:
  Fix inverted display of 'R' and 'M' during 'commit -v'
modified:
  NEWS
  bzrlib/branch.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2005-03-25 03:47:11 +0000
+++ b/NEWS	2005-03-25 03:47:50 +0000
@@ -9,6 +9,10 @@
     * Less file flushing and faster performance when writing logs and
       committing to stores.
 
+  BUG FIXES:
+
+    * Fix inverted display of 'R' and 'M' during 'commit -v'.
+
   PORTABILITY:
 
     * Include a subset of ElementTree-1.2.20040618 to make

=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2005-03-23 03:09:50 +0000
+++ b/bzrlib/branch.py	2005-03-25 03:47:50 +0000
@@ -480,9 +480,9 @@
                             state = 'A'
                         elif (old_ie.name == entry.name
                               and old_ie.parent_id == entry.parent_id):
+                            state = 'M'
+                        else:
                             state = 'R'
-                        else:
-                            state = 'M'
 
                         show_status(state, entry.kind, quotefn(path))