mirror of
https://github.com/rclone/rclone.git
synced 2026-10-28 14:28:38 -04:00
Before this change, when a file was new or changed on both paths and the pre-sync conflict check deemed the two copies identical, bisync skipped the copy and then rechecked the file after the sync to get its listing info. If the recheck could not confirm equality (for example, hashes unavailable due to --size-only or (--ignore-checksum + no common hash)), the file was rolled back to be retried on the next run, and every later run repeated the same check with the same result. A later change on one side was then handled against a missing or stale listing entry. After this change, files we've declared identical pre-sync are no longer rechecked post-sync. The pre-sync conflict check now also returns the values it compared, and a skipped file is recorded from the listing snapshot. If either path changed between the snapshot and the check, the prior listing is kept and the next run rechecks. When --size-only or (--ignore-checksum + no common hash) are in use, the "new or changed on both paths and equal" case skips the conflict check entirely, because it is unnecessary. The check could only compare sizes, which we already know are equal from the snapshot. The new `test_equal_skipped`, `test_conflict_window`, and `test_conflict_window_size` scenarios cover identical files that change on one path during the sync, files that change between the listing snapshot and the check for identical files, and `--size-only` files with the same size but different content. Co-Authored-By: ASRodrigo1 <45823308+asrodrigo1@users.noreply.github.com>
Docs
This directory tree is used to build all the different docs for rclone.
See the content directory for the docs in markdown format.
Note that some of the docs are auto-generated - these should have a DO NOT EDIT marker near the top.
Use hugo to build the website.
Changing the layout
If you want to change the layout then the main files to edit are
layout/index.htmlfor the front pagechrome/*.htmlfor the HTML fragments_default/single.mdfor the default templatepage/single.mdfor the page template
Running make serve in a terminal give a live preview of the website
so it is easy to tweak stuff.
What are all these files
├── config.json - hugo config file
├── content - docs and backend docs
│ ├── _index.md - the front page of rclone.org
│ ├── commands - auto-generated command docs - DO NOT EDIT
├── i18n
│ └── en.toml - hugo multilingual config
├── layouts - how the markdown gets converted into HTML
│ ├── 404.html - 404 page
│ ├── chrome - contains parts of the HTML page included elsewhere
│ │ ├── footer.copyright.html - copyright footer
│ │ ├── footer.html - footer including scripts
│ │ ├── header.html - the whole html header
│ │ ├── header.includes.html - header includes e.g. css files
│ │ ├── menu.html - left hand side menu
│ │ ├── meta.html - meta tags for the header
│ │ └── navbar.html - top navigation bar
│ ├── _default
│ │ └── single.html - the default HTML page render
│ ├── index.html - the index page of the whole site
│ ├── page
│ │ └── single.html - the render of all "page" type markdown
│ ├── partials - bits of HTML to include into layout .html files
│ │ └── version.html - the current version number
│ ├── rss.xml - template for the RSS output
│ ├── section - rendering for sections
│ │ └── commands.html - rendering for /commands/index.html
│ ├── shortcodes - shortcodes to call from markdown files
│ │ ├── cdownload.html - download the "current" version
│ │ ├── download.html - download a version with the partials/version.html number
│ │ ├── provider.html - used to make provider list on the front page
│ │ └── version.html - used to insert the current version number
│ └── sitemap.xml - sitemap template
├── public - render of the website
├── README.md - this file
├── resources - don't know!
│ └── _gen
│ ├── assets
│ └── images
└── static - static content for the website
├── css
│ ├── bootstrap.css
│ └── custom.css - custom css goes here
├── fontawesome
│ ├── css
│ └── webfonts
├── img - images used
├── js
│ ├── bootstrap.js
│ ├── custom.js - custom javascript goes here
│ └── jquery.js