Branch: refs/heads/master Home: https://github.com/ianhinder/Kranc Commit: 8dfa18b989eb7fe0f65c44aade28d6efedacda45 https://github.com/ianhinder/Kranc/commit/8dfa18b989eb7fe0f65c44aade28d6efed... Author: Ian Hinder ian.hinder@aei.mpg.de Date: 2015-01-23 (Fri, 23 Jan 2015)

Changed paths: M Tools/CodeGen/Thorn.m

Log Message: ----------- Thorn.m: Add some comments to the file merging code

Commit: 96830d53d11b417a1a71b00d815cc12d51b91d1f https://github.com/ianhinder/Kranc/commit/96830d53d11b417a1a71b00d815cc12d51... Author: Ian Hinder ian.hinder@aei.mpg.de Date: 2015-01-23 (Fri, 23 Jan 2015)

Changed paths: M Tools/CodeGen/Thorn.m

Log Message: ----------- Thorn.m: Catch errors when merging files

If a broken symbolic link, e.g. as created by Emacs as a lock file, is found in the merge directory, Import generates a message which doesn't indicate the problematic filename and continues, and Kranc chokes on the result. In this commit, check for messages generated during Import, and if there were any, abort with a fatal error with the filename in the error message.

See #115.

Commit: d2cf2bde6c4a9ebd6f7b95019d080ec1e61092e0 https://github.com/ianhinder/Kranc/commit/d2cf2bde6c4a9ebd6f7b95019d080ec1e6... Author: Ian Hinder ian.hinder@aei.mpg.de Date: 2015-01-23 (Fri, 23 Jan 2015)

Changed paths: M Tools/CodeGen/Thorn.m

Log Message: ----------- Thorn.m: Ignore emacs backup and lock files

See #115 and #105.

Commit: fbebcbaa0e10b449c5cd7751528ee2cf295b7b60 https://github.com/ianhinder/Kranc/commit/fbebcbaa0e10b449c5cd7751528ee2cf29... Author: Ian Hinder ian.hinder@aei.mpg.de Date: 2015-01-23 (Fri, 23 Jan 2015)

Changed paths: A Tests/Data/MergeFilesIgnore/.#file.txt A Tests/Data/MergeFilesIgnore/dir/.#file.txt A Tests/Data/MergeFilesIgnore/file.txt A Tests/Data/MergeFilesIgnore/file.txt~ M Tests/Kranc.mt

Log Message: ----------- Add test for ignored merge files

Compare: https://github.com/ianhinder/Kranc/compare/1babe70ad6a2...fbebcbaa0e10