Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflicts created on Android on files modified by other devices #8654

Closed
imsodin opened this issue Nov 7, 2022 · 2 comments
Closed

Conflicts created on Android on files modified by other devices #8654

imsodin opened this issue Nov 7, 2022 · 2 comments
Assignees
@imsodin
Labels
bug A problem with current functionality, as opposed to missing functionality (enhancement) frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Milestone
v1.22.2

Comments

@imsodin
Copy link
Member

imsodin commented Nov 7, 2022

As reported in a ot of places:

#8604 (comment)

https://forum.syncthing.net/t/keep-getting-conflicts-generated-on-android-device-for-files-modified-only-on-a-desktop-pc/19060/24

https://forum.syncthing.net/t/file-conflict-for-every-modification-on-android/19272
@imsodin imsodin added the bug A problem with current functionality, as opposed to missing functionality (enhancement) label Nov 7, 2022
@imsodin imsodin self-assigned this Nov 7, 2022
imsodin added a commit to imsodin/syncthing that referenced this issue Nov 7, 2022
@imsodin
lib: Don't bump version when inode time only changes (fixes syncthing…
dc19212 
…#8654)
imsodin added a commit to imsodin/syncthing that referenced this issue Nov 7, 2022
@imsodin
lib/protocol: Ignore inode time when both xattr and ownership is igno…
9a4719e 
…red (fixes syncthing#8654)
imsodin added a commit to imsodin/syncthing that referenced this issue Nov 7, 2022
@imsodin
lib: Don't bump version when inode time only changes (fixes syncthing…
165d032 
…#8654)
@imsodin imsodin mentioned this issue Nov 7, 2022
Closed
@tomasz1986
Copy link
Contributor

tomasz1986 commented Nov 7, 2022 •
edited
Loading

How about changing the title to something more alike "Conflicts created on Android on files modified by other devices"? I think that's what the problem is really about. I'd also like to add that it's not exactly "on every modification", but I couldn't figure out why sometimes conflicts were created and other times weren't 🤔.

@imsodin imsodin changed the title Conflicts created on every modification on android Conflicts created on Android on files modified by other devices Nov 8, 2022
@calmh calmh closed this as completed in ce2a686 Nov 8, 2022
calmh added a commit to imsodin/syncthing that referenced this issue Nov 8, 2022
@calmh
Merge branch 'main' into fix-8556
db49472 
* main: (36 commits)
  lib/protocol: Ignore inode time when xattr&ownership is ignored (fixes syncthing#8654) (syncthing#8655)
  lib/fs: Try to remove read only Windows files (fixes syncthing#3744) (syncthing#8650)
  gui: Add copy to clipboard, share by email, and share by SMS buttons to device IDs (fixes syncthing#2771, ref syncthing#3868) (syncthing#7984)
  gui, man, authors: Update docs, translations, and contributors
  build: Add GitHub actions build for Windows (syncthing#8627)
  gui: Fix connection type icon width (fixes syncthing#8592) (syncthing#8644)
  gui: Adjust connection type icon size scaling and alignment (syncthing#8645)
  docker: Use healthcheck endpoint (syncthing#8640)
  lib/connections: Use adaptive write size for rate limited connections (fixes syncthing#8630) (syncthing#8631)
  gui: Mark devices that haven't connected for a long time (fixes syncthing#7703) (syncthing#8530)
  gui: Fix rescan interval when add encrypted folder with watch for changes enabled (fixes syncthing#8570) (syncthing#8571)
  gui: Always show Out of Sync Items for remote devices (syncthing#8632)
  lib/fs: Let xattr test avoid non-test attributes (fixes syncthing#8601) (syncthing#8628)
  build: Add GitHub actions build for Windows
  gui, man, authors: Update docs, translations, and contributors
  gui: Display folder and device count number (syncthing#8615)
  gui, man, authors: Update docs, translations, and contributors
  lib/model, lib/protocol: Fix file comparisons (fixes syncthing#8594) (syncthing#8603)
  lib/scanner: More sensible debug output (syncthing#8596)
  gui: Allow automatic device ID selection on WebKit browsers (ref syncthing#8544) (syncthing#8597)
  ...
imsodin added a commit that referenced this issue Nov 8, 2022
@imsodin
lib/protocol: Ignore inode time when xattr&ownership is ignored (fixes …
15c0afe 
…#8654) (#8655)

lib/protocol: Ignore inode time when both xattr and ownership is ignored (fixes #8654)
@calmh calmh added this to the v1.22.2 milestone Nov 9, 2022
calmh added a commit to calmh/syncthing that referenced this issue Nov 22, 2022
@calmh
Merge branch 'main' into linuxbuild
4ee1015 
* main: (23 commits)
  lib/fs: Optimize WindowsInvalidFilename (syncthing#8687)
  gui, man, authors: Update docs, translations, and contributors
  cmd/syncthing: Use main logger in generate subcommand (fixes syncthing#8682) (syncthing#8685)
  build: Update all dependencies (fixes syncthing#8679) (syncthing#8680)
  gui, man, authors: Update docs, translations, and contributors
  lib/model: Correctly set xattrs on temp files (fixes syncthing#8667) (syncthing#8670)
  gui: Automatically dismiss authentication reminder when in LDAP mode (fixes syncthing#8661) (syncthing#8663)
  lib/model: Correctly handle xattrs on directories (fixes syncthing#8657) (syncthing#8658)
  lib/protocol: Ignore inode time when xattr&ownership is ignored (fixes syncthing#8654) (syncthing#8655)
  lib/fs: Try to remove read only Windows files (fixes syncthing#3744) (syncthing#8650)
  gui: Add copy to clipboard, share by email, and share by SMS buttons to device IDs (fixes syncthing#2771, ref syncthing#3868) (syncthing#7984)
  gui, man, authors: Update docs, translations, and contributors
  build: Add GitHub actions build for Windows (syncthing#8627)
  gui: Fix connection type icon width (fixes syncthing#8592) (syncthing#8644)
  gui: Adjust connection type icon size scaling and alignment (syncthing#8645)
  docker: Use healthcheck endpoint (syncthing#8640)
  lib/connections: Use adaptive write size for rate limited connections (fixes syncthing#8630) (syncthing#8631)
  gui: Mark devices that haven't connected for a long time (fixes syncthing#7703) (syncthing#8530)
  gui: Fix rescan interval when add encrypted folder with watch for changes enabled (fixes syncthing#8570) (syncthing#8571)
  gui: Always show Out of Sync Items for remote devices (syncthing#8632)
  ...
@jeron1
Copy link

jeron1 commented Dec 21, 2022

Just donated 20 Euros, as I greatly appreciate this maintenance and the continued smooth syncing between my Android and Linux PCs.
st donate

@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Nov 8, 2023
@syncthing syncthing locked and limited conversation to collaborators Nov 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@imsodin imsodin

Labels
bug A problem with current functionality, as opposed to missing functionality (enhancement) frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Milestone
v1.22.2
Development

No branches or pull requests
5 participants
@calmh @tomasz1986 @imsodin @st-review @jeron1