From c648548e1fa9dd2f972accee5db5d2353c088384 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Aug 2014 14:56:40 -0400 Subject: [PATCH] formatting --- doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn b/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn index ba7526ed2e..f5f1354440 100644 --- a/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn +++ b/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn @@ -6,15 +6,19 @@ differed in their timestamps, and the union merge kept both, so that I now have .log files in the annex branch that contain duplicate parts like this. +
 1404838274.151066s 1 a2401cfd-1f58-4441-a2b3-d9bef06220ad
 1406978406.24838s 1 a2401cfd-1f58-4441-a2b3-d9bef06220ad
+
The UUID here is my local repository. The duplication also occurred in the uuid.log: +
 4316c3dc-5b6d-46eb-b780-948c717b7be5 server timestamp=1404839228.113473s
 4316c3dc-5b6d-46eb-b780-948c717b7be5 server timestamp=1404847241.863051s
+
Is this something to be concerned about? The situation somehow arose in relation to unannexing a bunch of files and rebasing the master