Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 418
- a13fe26c57a4
- parent 248
- f4561c24989a
- child 425
- ca5e65413fc5
- child 443
- 1e3e8ffa548f
equal
deleted
inserted
replaced
| 417:459855d3066e | 418:a13fe26c57a4 |
|---|---|
| 1291 line = line.strip() | 1291 line = line.strip() |
| 1292 if line.startswith('<url>'): | 1292 if line.startswith('<url>'): |
| 1293 reposURL = line.replace('<url>', '').replace('</url>', '') | 1293 reposURL = line.replace('<url>', '').replace('</url>', '') |
| 1294 return reposURL | 1294 return reposURL |
| 1295 | 1295 |
| 1296 return None | 1296 return "" |
| 1297 | 1297 |
| 1298 def svnResolve(self, name): | 1298 def svnResolve(self, name): |
| 1299 """ | 1299 """ |
| 1300 Public method used to resolve conflicts of a file/directory. | 1300 Public method used to resolve conflicts of a file/directory. |
| 1301 | 1301 |
