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

adjusted branches: submodule deletions not propagated on sync #5290

Closed
kyleam opened this issue Jan 7, 2021 · 1 comment
Closed

adjusted branches: submodule deletions not propagated on sync #5290

kyleam opened this issue Jan 7, 2021 · 1 comment
Labels
adjusted-branches Issues caused by or affected adjusted branch operation annex Git-annex related issue for our information Announcement-type issues (possibly inconsequential)

Comments

@kyleam
Copy link
Contributor

kyleam commented Jan 7, 2021

While looking into an adjusted branch-related test failure today, I noticed that calling datalad remove <subdataset> on an adjusted branch didn't register the deletion in the main branch. I'm opening an issue here just as a heads up; I've reported the bug along with a potential fix on git-annex's side:

https://git-annex.branchable.com/bugs/Submodule_deletion_not_synced_from_adjusted_branch/

Unfortunately I don't see an easy way we could address this on our end for older git-annex versions.

Re: #4292

@kyleam kyleam added annex Git-annex related issue for our information Announcement-type issues (possibly inconsequential) adjusted-branches Issues caused by or affected adjusted branch operation labels Jan 7, 2021
@kyleam
Copy link
Contributor Author

kyleam commented Jan 7, 2021

Fixed by 8.20201129-78-gfd161da2c (adjustTree: Consider submodule deletions, 2021-01-06).

@kyleam kyleam closed this as completed Jan 7, 2021
kyleam added a commit to kyleam/datalad that referenced this issue Mar 18, 2021
Increasing GIT_ANNEX_MIN_VERSION is long overdue.  The main question
is what the new minimum should be.  Some landmarks:

  * 7.20190912 is when v5 repos started automatically upgrading (to
    v7).

  * buster-backports has 8.20200330.

  * Neurodebian currently has a recent release (8.20210223).

  * 8.20200330 is required so that subdataset changes are synced back
    to an adjusted branch (datalad#4292).  subdataset deletions require
    8.20210127 (datalad#5290).

  * 7.20200202.7 until 8.20200309 is incompatible with the ora special
    remote (dataladgh-4509).

As suggested by dataladgh-5399, we probably shouldn't increase this beyond
what's available from buster-backports.  That's 8.20200330 and would
be a good minimum due to the subdataset/adjusted branch fixes.

However, conda-forge doesn't have 8.20200330, which makes testing the
minimum on the CI a little more complicated.  It does have one release
earlier, 8.20200309.  So, go with 8.20200309 for ease of testing.

Closes datalad#5399.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
adjusted-branches Issues caused by or affected adjusted branch operation annex Git-annex related issue for our information Announcement-type issues (possibly inconsequential)
Projects
None yet
Development

No branches or pull requests

1 participant