# # # patch "NEWS" # from [96cc469d41eda0ab62590dbbaa1aa0143e7d9ec1] # to [0ca6a4be4c4d8778468cb584963db8c98c1959b2] # # patch "win32/main.cc" # from [283e7fe96c5964a4408e17344a94b5a87b0ce6af] # to [8b14cc20945d524354751fd745044d96cfe69f96] # ============================================================ --- NEWS 96cc469d41eda0ab62590dbbaa1aa0143e7d9ec1 +++ NEWS 0ca6a4be4c4d8778468cb584963db8c98c1959b2 @@ -43,6 +43,10 @@ xxx xxx xx xx:xx:xx UTC 2010 in 0.47 but not noted in the release notes at that time (fixes monotone bug #28991). + - monotone on Windows will now have a non-zero exit code when + interrupted (^C). This was broken in 0.47 when it was fixed to not + throw an exception on being interrupted. + Other - Support for the diffuse merger (http://diffuse.sourceforge.net) ============================================================ --- win32/main.cc 283e7fe96c5964a4408e17344a94b5a87b0ce6af +++ win32/main.cc 8b14cc20945d524354751fd745044d96cfe69f96 @@ -180,7 +180,7 @@ BOOL WINAPI ConsoleCtrlHandler(DWORD wha //ExitProcess(0); // this exits without calling cleanup routines (atexit() and the like) - TerminateProcess(GetCurrentProcess(), 0); + TerminateProcess(GetCurrentProcess(), 1); // returning FALSE crashes (calls ExitProcess()); TRUE exits or does nothing return FALSE;