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

Implement branch reset functionality #301

Merged
merged 3 commits into from
Oct 18, 2024
Merged

Implement branch reset functionality #301

merged 3 commits into from
Oct 18, 2024

Conversation

paraseba
Copy link
Contributor

@paraseba paraseba commented Oct 18, 2024

This is history editing functionality. It works by creating a new version of the branch ref, pointing to the given Snapshot.

Closes: #272

This is history editing functionality. It works by creating a new
version of the branch ref, pointing to the given Snapshot.
Copy link
Contributor

@rabernat rabernat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be very useful. Great work!

From a big picture point of view, it would be helpful to see where this feature fits into the broader roadmap of version control features.

Also, we will need to document this and other version control features at some point.

icechunk-python/python/icechunk/__init__.py Outdated Show resolved Hide resolved
The snapshot id can be obtained as the result of a commit operation, but, more probably,
as the id of one of the SnapshotMetadata objects returned by `ancestry()`

This operation edits the repository history, it must be executed carefully.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
This operation edits the repository history, it must be executed carefully.
This operation edits the repository history; it must be executed carefully.

icechunk/src/zarr.rs Outdated Show resolved Hide resolved
paraseba and others added 2 commits October 18, 2024 14:09
Co-authored-by: Ryan Abernathey <ryan.abernathey@gmail.com>
Co-authored-by: Matthew Iannucci <mpiannucci@gmail.com>
@paraseba
Copy link
Contributor Author

paraseba commented Oct 18, 2024

From a big picture point of view, it would be helpful to see where this feature fits into the broader roadmap of version control features.

The reason why I switched to this was that I thought of two possible ways to implement it, and one of them (that may be slightly better) would have some impact on commit conflict resolution. So I wanted to get it in first.

we will need to document this and other version control features at some point.

yeah, I think this is urgent. Earthmovers get it because of the similarities, but, to the general public, there is a lot of power to discover.

@paraseba paraseba merged commit aa7f8ac into main Oct 18, 2024
3 checks passed
@paraseba paraseba deleted the seba/reset-branch branch October 18, 2024 17:13
dcherian added a commit that referenced this pull request Oct 21, 2024
* main: (167 commits)
  Bump actions/checkout from 2 to 4 in the actions group (#305)
  update zarr pin to v3.0.0b1 (#302)
  Fix non-conformant "attributes" metadata (#303)
  Implement branch reset functionality (#301)
  README minor tune up: syntax and other very minor typos etc (#300)
  remove awaits in icechunk notebook (#298)
  Add missing permission to release action (#295)
  Minor changes to virtual docs (#293)
  Add changelogs (#291)
  Install cargo release (#290)
  Update python ci (#289)
  GHA workflow to release Rust (#288)
  Release 0.1.0-alpha.3 to the Rust world (#287)
  `ByteRange` can do last n bytes now (#285)
  Introduce `Store::list_dir_items` (#286)
  [Docs] Improve virtual ref docs (#284)
  [Docs] correct output dimensions in xr example (#283)
  [Docs] add note for requirements of tutorial data download (#282)
  [Docs] correct module calls to match imports (#281)
  fix(docs): Docs postlaunch fixes (#278)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ability to reset a branch
3 participants