Commits

Steve Borho committed bc7d376

chunks: catch ValueError from internalpatch (fixes #1249)

Comments (0)

Files changed (1)

tortoisehg/hgqt/chunks.py

                                           eolmode=eolmode)
                 if updatestate:
                     cmdutil.updatedir(repo.ui, repo, pfiles)
+            except ValueError:
+                ret = -1
             if ret < 0:
                 ok = False
                 self.showMessage.emit(_('Patch failed to apply'))
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.