diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-03 20:36:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-03 20:36:10 -0400 |
| commit | bf4392d2235c1efa9ec0609022d2128f4310bc2b (patch) | |
| tree | 62df6f58ae32a7f56d97e6d43ee25268f1ac3958 | |
| parent | d6ff8b4f8585cb765ef433e0af9f74d30418525e (diff) | |
| parent | 312d38e5cf1748ce58a944020411040e6ad07b35 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/forum/Duplicate_entries_in_location_tracking_logs/comment_1_3afb76397519b8ca8b55958a344f1871._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/Duplicate_entries_in_location_tracking_logs/comment_1_3afb76397519b8ca8b55958a344f1871._comment b/doc/forum/Duplicate_entries_in_location_tracking_logs/comment_1_3afb76397519b8ca8b55958a344f1871._comment new file mode 100644 index 000000000..cc159bd30 --- /dev/null +++ b/doc/forum/Duplicate_entries_in_location_tracking_logs/comment_1_3afb76397519b8ca8b55958a344f1871._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.112" + subject="comment 1" + date="2014-08-03T18:59:58Z" + content=""" +This is perfectly normal. The next time that file in the git-annex branch is updated for any reason, git-annex will automatically compress the two entries down to a single one. In the meantime, it has no difficulty working out which entry is more recent. This is basically why it's called a log file. ;) + +It would be possible to make the union merge code compress as it merges, but this would slow down union merging some, and make it a more conceptually complicated operation. Also, whether the old entry is present in the file or not, git will be storing a copy of that old entry, so it doesn't actually tend to make the git repository any larger. For more on this, see <https://joeyh.name/blog/entry/databranches/> +"""]] |