I tried a local merge+commit and the following things break with the hook:
The following differences were found between the code to commit and the rules in '.uncrustify-0.57.cfg':
--- /home/mkomu/projects/hipl-bzr/trunk/libhipl/cookie.c 2012-09-17 15:37:06.982202000 +0300 +++ - 2012-09-17 15:37:59.286725479 +0300 @@ -250,7 +250,7 @@ return NULL; }
- if((r1 = hip_msg_alloc()) == NULL) { + if ((r1 = hip_msg_alloc()) == NULL) { return NULL; }
--- /home/mkomu/projects/hipl-bzr/trunk/libhipl/output.c 2012-09-17 15:37:06.982202000 +0300 +++ - 2012-09-17 15:37:59.438372623 +0300 @@ -341,7 +341,7 @@ static int add_echo_response(struct hip_packet_context *ctx, int sign) { int param_type = sign ? HIP_PARAM_ECHO_REQUEST_SIGN - : HIP_PARAM_ECHO_REQUEST; + : HIP_PARAM_ECHO_REQUEST;
const struct hip_echo_msg *ping = hip_get_param(ctx->input_msg, param_type);
« Back to merge proposal
I tried a local merge+commit and the following things break with the hook:
The following differences were found between the code to commit and the rules in '.uncrustify- 0.57.cfg' :
--- /home/mkomu/ projects/ hipl-bzr/ trunk/libhipl/ cookie. c 2012-09-17 15:37:06.982202000 +0300
+++ - 2012-09-17 15:37:59.286725479 +0300
@@ -250,7 +250,7 @@
return NULL;
}
- if((r1 = hip_msg_alloc()) == NULL) {
+ if ((r1 = hip_msg_alloc()) == NULL) {
return NULL;
}
--- /home/mkomu/ projects/ hipl-bzr/ trunk/libhipl/ output. c 2012-09-17 15:37:06.982202000 +0300 response( struct hip_packet_context *ctx, int sign) ECHO_REQUEST_ SIGN ECHO_REQUEST; ECHO_REQUEST;
+++ - 2012-09-17 15:37:59.438372623 +0300
@@ -341,7 +341,7 @@
static int add_echo_
{
int param_type = sign ? HIP_PARAM_
- : HIP_PARAM_
+ : HIP_PARAM_
const struct hip_echo_msg *ping = hip_get_ param(ctx- >input_ msg, param_type);