Armin Rigo avatar Armin Rigo committed 3c31bf7

Re-enable printing conflicts, which seems to work fine now.

Comments (0)

Files changed (1)


             while True:
                 with signals_enabled:
                     with atomic:
-                        # XXX the call to report_abort_info() is disabled for
-                        # XXX now because it's buggy
-                        #info = last_abort_info()
-                        #if info is None:
+                        info = last_abort_info()
+                        if info is None:
                             if not got_exception:
                                 f(*args, **kwds)
                             # else return early if already an exc to reraise
-                #report_abort_info(info)
+                report_abort_info(info)
             got_exception[:] = sys.exc_info()
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
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.