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.

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

lib/model: Partial revert of rename fix (fixes #6653) #6656

Merged
merged 1 commit into from May 16, 2020

Conversation

calmh
Copy link
Member

@calmh calmh commented May 16, 2020

We can't just drop the snap because it's in use elsewhere. This should
be equally functional.

We can't just drop the snap because it's in use elsewhere. This should
be equally functional.
@calmh
Copy link
Member Author

calmh commented May 16, 2020

Fast-tracking as we have an RC out that can't scan.

@calmh calmh merged commit 651ee2c into syncthing:master May 16, 2020
calmh added a commit that referenced this pull request May 16, 2020
We can't just drop the snap because it's in use elsewhere. This should
be equally functional.
calmh added a commit that referenced this pull request May 16, 2020
* release:
  lib/model: Partial revert of rename fix (fixes #6653) (#6656)
@AudriusButkevicius
Copy link
Member

Thanks for fixing this.

calmh added a commit to calmh/syncthing that referenced this pull request May 18, 2020
* master: (167 commits)
  lib/db: Don't panic on seq. coruption when debugging (syncthing#6662)
  cmd/stindex: Add missing KeyType values in stindex dump code (syncthing#6659)
  lib/model: Don't crash when taking rename shortcut (fixes syncthing#6654) (syncthing#6657)
  cmd/syncthing: Don't crash when failing to create default config (fixes syncthing#6655) (syncthing#6658)
  lib/model: Partial revert of rename fix (fixes syncthing#6653) (syncthing#6656)
  lib/model: Partial revert of rename fix (fixes syncthing#6653) (syncthing#6656)
  lib/model: Fix rename handling (ref syncthing#6650) (syncthing#6652)
  lib/db: Filter repeat files in one update (ref syncthing#6650) (syncthing#6651)
  lib/model: Fix rename handling (ref syncthing#6650) (syncthing#6652)
  lib/db: Filter repeat files in one update (ref syncthing#6650) (syncthing#6651)
  docker: Add tzdata for local time log entries
  docker: Improved health check for host networks (syncthing#6649)
  lib/fs: Set execute bits on junctions converted to dirs (ref syncthing#6606) (syncthing#6645)
  lib/model: Close conns when devices are removed (fixes syncthing#6564) (syncthing#6641)
  lib/model: Adjust remote-rename-test to timer-based versions (fixes syncthing#6625) (syncthing#6644)
  lib/fs: Prevent race-detector triggering in tests (fixes syncthing#6608) (syncthing#6642)
  lib/fs: Treat Windows junctions as normal directories (syncthing#6606)
  lib/db: Dont add symlinks to blocks map (fixes syncthing#6637) (syncthing#6639)
  lib/db: Dont add symlinks to blocks map (fixes syncthing#6637) (syncthing#6639)
  Add indirection for large version vectors. (syncthing#6376)
  ...
@calmh calmh added this to the v1.7.0 milestone May 20, 2020
@calmh calmh deleted the fix6653 branch May 27, 2020 12:33
@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 May 17, 2021
@syncthing syncthing locked and limited conversation to collaborators May 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants