Skip to content
This repository has been archived by the owner on Feb 7, 2023. It is now read-only.

Fix undo/scheduling not being cleared on DB writes #4

Merged
merged 1 commit into from
Jul 19, 2022

Conversation

dae
Copy link

@dae dae commented Jul 8, 2022

The undo code was added after David's initial work, so it was missing
from his code. Fixed by refactoring so they both use the same code
path.

Individual change is 55e49a8 - I've squashed it into the earlier commit. I also dropped the second commit on the branch which built web assets, since it looks like @krmanik's approach is the way forward.

Recommend you either

a) pull into a new branch like ankidroid-2.1.54.1, avoiding rebase, or
b) tag current ankidroid-2.1.54 with ankidroid-2.1.54.0 (so we have a record of where it was before), then force-push this branch into the existing one

@dae dae changed the base branch from main to ankidroid-2.1.54 July 8, 2022 13:18
@dae dae force-pushed the ankidroid-2.1.54 branch from 55e49a8 to e95d8b6 Compare July 8, 2022 13:19
Most of the work here was done by David in the Backend repo; I've just
moved it into an rslib patch so it can take advantage of the existing
backend infrastructure.
@dae dae force-pushed the ankidroid-2.1.54 branch from fe51d9b to c7ef2b4 Compare July 18, 2022 04:10
@dae
Copy link
Author

dae commented Jul 18, 2022

I've squashed the following commit: ankitects@fe51d9b

@mikehardy mikehardy changed the base branch from ankidroid-2.1.54 to ankidroid-2.1.54.1 July 19, 2022 04:55
@mikehardy mikehardy merged commit c7ef2b4 into ankidroid:ankidroid-2.1.54.1 Jul 19, 2022
@mikehardy
Copy link
Member

I liked option (a) and went with it

similar to last time:

On the command line, assuming you have "origin" set up as a remote (to a personal fork), "upstream" set up as a remote pointing at ankitects/anki, and you have "ankidroid" set up as a remote, it looked like this:

git co main
git fetch upstream
git rebase upstream/main
git push origin
git push ankidroid
git co -b ankidroid-2.1.54 # this works because it is unambiguous to this point, it only existed in ankitects remote to start
git reset --hard 67e4edc # that was the most recent commit hash on ankitects/main for this PR
git push ankidroid # this gets us a clean ankidroid-2.1.54 branch at the divergence point, in our repo now
# Now on this PR edit it and change it to target our new branch, poof 2 commits as indicated
git merge --ff-only upstream/ankidroid-2.1.54  # now we have identical commit hashes from the PR, merged
git push ankidroid

Now we've pushed the commits here without modifying their commit hashes, so the commit hash in Anki-Android-Backend is stable

@dae dae deleted the ankidroid-2.1.54 branch May 6, 2023 02:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants