mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

move: Fix a regression in the last release that made move --to not honor numcopies settings

Browse source 
This commit was sponsored by Svenne Krap on Patreon.
This commit is contained in:
Joey Hess 2020-11-13 14:19:32 -04:00
parent 98d1cbd1ee
commit a30030c4a6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
git-annex (8.20201104) UNRELEASED; urgency=medium
* move: Fix a regression in the last release that made move --to not
honor numcopies settings.
* sync --content: Fix a bug where a file that was not preferred content
could be transferred to a remote. This happened when the file got deleted
after the sync started running.

2
Command/Move.hs
View file

@ -151,7 +151,7 @@ toPerform dest removewhen key afile fastcheck isthere = do
when fastcheck $
warning "This could have failed because --fast is enabled."
stop
Right True -> logMove srcuuid destuuid False key $ \deststartedwithcopy ->
Right True -> logMove srcuuid destuuid True key $ \deststartedwithcopy ->
finish deststartedwithcopy $
unlessM (expectedPresent dest key) $
Remote.logStatus dest key InfoPresent

2
doc/bugs/move_violates_numcopies___40__regression__41__.mdwn
View file

@ -54,3 +54,5 @@ Relevant links:
I'm really excited about using git-annex, and have spent 3-4 days reading documentation, past bug reports, setting up repos, transferring data, and manually testing failure cases (e.g. this one :p).
Thanks for all your hard work!
> [[fixed|done]] --[[Joey]]

15
doc/bugs/move_violates_numcopies___40__regression__41__/comment_2_98a0c583ed094fec0e8c666e5839c2f7._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-11-13T18:01:29Z"
content="""
Oh what a dumb mistake, literally a copied "False" that should be "True".
I'm going to move the next release up due to this regression, but
thankfully it doesn't result in data loss, so am not going to do a crash
priority release. Probably Monday.
The test suite also has a test case for move and numcopies now. It used to be
ok for it to only test drop and numcopies, but that changed a while back
and it should have had one already.
"""]]