formatting
This commit is contained in:
parent
63c00daa08
commit
c648548e1f
1 changed files with 4 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue