Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 7836
- 2f0d208b8137
- parent 7785
- 9978016560ec
- child 7900
- 72b88fb20261
- child 7919
- b53ea4decd93
equal
deleted
inserted
replaced
| 7835:0835ed67714b | 7836:2f0d208b8137 |
|---|---|
| 2049 else: | 2049 else: |
| 2050 try: | 2050 try: |
| 2051 with open(name, "r", encoding="utf-8") as f1: | 2051 with open(name, "r", encoding="utf-8") as f1: |
| 2052 output2 = f1.read() | 2052 output2 = f1.read() |
| 2053 name2 = name | 2053 name2 = name |
| 2054 except IOError: | 2054 except OSError: |
| 2055 E5MessageBox.critical( | 2055 E5MessageBox.critical( |
| 2056 self.__ui, | 2056 self.__ui, |
| 2057 self.tr("Subversion Side-by-Side Difference"), | 2057 self.tr("Subversion Side-by-Side Difference"), |
| 2058 self.tr( | 2058 self.tr( |
| 2059 """<p>The file <b>{0}</b> could not be read.</p>""") | 2059 """<p>The file <b>{0}</b> could not be read.</p>""") |
