Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 14:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report ifcmerge conflicts in pop-up #3096

Browse Source
This commit is contained in:
Bruno Postle
2023-05-10 22:45:22 +01:00
parent bb48d4aac1
commit b77849d279
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/tool/ifcgit.py
+3 -3
View File
@@ -325,12 +325,12 @@ class IfcGit:
# merge is expected to fail, run ifcmerge # merge is expected to fail, run ifcmerge
try: try:
repo.git.mergetool(tool="ifcmerge") repo.git.mergetool(tool="ifcmerge")
except: except git.exc.GitCommandError as exc:
message = re.sub("( stderr: '|')", "", exc.stderr)
# ifcmerge failed, rollback # ifcmerge failed, rollback
repo.git.merge(abort=True) repo.git.merge(abort=True)
# FIXME need to report errors somehow
operator.report({"ERROR"}, "IFC Merge failed") operator.report({"ERROR"}, "IFC Merge failed:" + message)
return False return False
except: except: