Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Mar 23 19:00:52 2018 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Mar 23 19:58:01 2018 +0100
@@ -160,12 +160,12 @@
         self.status = {
             ' ': self.tr('normal'),
             'A': self.tr('added'),
+            'C': self.tr('conflict'),
             'D': self.tr('deleted'),
+            'I': self.tr('ignored'),
             'M': self.tr('modified'),
             'R': self.tr('replaced'),
-            'C': self.tr('conflict'),
             'X': self.tr('external'),
-            'I': self.tr('ignored'),
             '?': self.tr('unversioned'),
             '!': self.tr('missing'),
             '~': self.tr('type error'),
@@ -186,6 +186,7 @@
         self.switched = {
             ' ': self.tr('no'),
             'S': self.tr('yes'),
+            'X': self.tr('external')
         }
         self.lockinfo = {
             ' ': self.tr('not locked'),
@@ -511,9 +512,10 @@
                     flags = self.rx_status2.cap(1)
                     path = self.rx_status2.cap(2).strip()
                     
-                    self.__generateItem(flags[0], flags[1], flags[2], flags[3],
-                                        flags[4], flags[5], flags[-1], "", "",
-                                        "", path)
+                    if flags[-1] in self.uptodate:
+                        self.__generateItem(flags[0], flags[1], flags[2],
+                                            flags[3], flags[4], flags[5],
+                                            flags[-1], "", "", "", path)
                 elif self.rx_changelist.exactMatch(s):
                     self.currentChangelist = self.rx_changelist.cap(1)
                     self.changelistFound = True