diff options
| author |  zardoz <zardoz@web> | 2014-08-03 15:25:47 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-08-03 15:25:47 +0000 |
| commit | 4f28b36164dff9f05aff72f634e7a784d4c2a014 (patch) | |
| tree | b11a1897b4e2d1d0ace8b20f17a1bceda2911899 /doc | |
| parent | b95bb923a48730a663ef810f4cc029f81aed50da (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn b/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn new file mode 100644 index 000000000..ba7526ed2 --- /dev/null +++ b/doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn @@ -0,0 +1,21 @@ +I’ve noticed something odd when inspecting the history of the +git-annex branch today. Apparently, the branch had some merge +conflicts during sync that involved two alternative location tracking +entries that both were for one and the same remote. Both entries only +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 +branch. |