Mercurial > hg > freeDiameter
changeset 834:84a23e90519d
More verbose information on conflicts
author | Sebastien Decugis <sdecugis@freediameter.net> |
---|---|
date | Fri, 28 Sep 2012 18:37:03 +0200 |
parents | 2bf587a8f6bc |
children | 885f5eb20b21 |
files | libfdproto/dictionary.c |
diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libfdproto/dictionary.c Fri Sep 28 18:18:21 2012 +0200 +++ b/libfdproto/dictionary.c Fri Sep 28 18:37:03 2012 +0200 @@ -1827,6 +1827,12 @@ } if (ret) { TRACE_DEBUG(INFO, "An existing object with different non-key data was found: EEXIST"); + if (TRACE_BOOL(INFO)) { + fd_log_debug("New object to insert:\n"); + dump_object(new, 0, 0, 3); + fd_log_debug("Object already in dictionary:\n"); + dump_object(locref, 0, 0 , 3); + } } else { TRACE_DEBUG(FULL, "An existing object with the same data was found, ignoring the error..."); }