diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-03 14:56:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-03 14:56:40 -0400 |
| commit | 845c4492a98498f1a77c34bf06cb8e7879cc28fc (patch) | |
| tree | 83244c71147da69c411bbce65fa6cccb8e3cbd75 /doc | |
| parent | 3edde1b27891c18ca74b728936b6ca3a3139f520 (diff) | |
formatting
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/Duplicate_entries_in_location_tracking_logs.mdwn | 4 |
1 files changed, 4 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 index ba7526ed2..f5f135444 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. +<pre> 1404838274.151066s 1 a2401cfd-1f58-4441-a2b3-d9bef06220ad 1406978406.24838s 1 a2401cfd-1f58-4441-a2b3-d9bef06220ad +</pre> The UUID here is my local repository. The duplication also occurred in the uuid.log: +<pre> 4316c3dc-5b6d-46eb-b780-948c717b7be5 server timestamp=1404839228.113473s 4316c3dc-5b6d-46eb-b780-948c717b7be5 server timestamp=1404847241.863051s +</pre> Is this something to be concerned about? The situation somehow arose in relation to unannexing a bunch of files and rebasing the master |