xstefen
/
calyxos-scripts
mirror of https://github.com/CalyxOS/scripts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
calyxos-scripts/aosp-merger
History
Michael Bestas 8971003d67
Revert "aosp-merger: Check if branch exists before abandoning" 
This reverts commit c687bd73d9.

Reason for revert: Not working now for some reason

Change-Id: I0b97da59b324f08449aaf643c13f0c563ce642ef
 		2023-12-04 22:32:40 +02:00
..
README.md aosp-merger: s/CalyxOS// 2022-10-05 21:11:41 +03:00
_merge_helper.sh Revert "aosp-merger: Check if branch exists before abandoning" 2023-12-04 22:32:40 +02:00
_subtree_merge_helper.sh Revert "aosp-merger: Check if branch exists before abandoning" 2023-12-04 22:32:40 +02:00
aosp-merger.sh aosp-merger: Support merging lineage device/kernels 2023-03-24 19:43:09 +02:00
branches_rebase.sh aosp-merger: Switch to SPDX copyright header 2022-01-10 04:41:30 +02:00
branches_restore.sh aosp-merger: Switch to SPDX copyright header 2022-01-10 04:41:30 +02:00
branches_save.sh aosp-merger: Switch to SPDX copyright header 2022-01-10 04:41:30 +02:00
merge-aosp-forks.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
merge-aosp.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
prepare-commit-msg aosp-merger: Improve merge commit message 2022-01-10 23:46:00 +05:30
push-merge.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
push-upstream.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
squash.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
upload-merge.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00
upload-squash.sh aosp-merger: Make script output a bit more readable 2023-11-06 23:25:24 +02:00

README.md

Rough workflow

  1. Snapshot the names of your current working branches to branches.list file:

    ./lineage/scripts/aosp-merger/branches_save.sh

  2. Note current aosp tag in .repo/manifests/default.xml, update it to desired new tag and then create a local commit for the change (aosp-merger script checks for any uncommitted changes in the .repo/manifests git repo).

  3. Create a staging branch and merge in the new AOSP tag:

    ./lineage/scripts/aosp-merger/aosp-merger.sh merge \<oldaosptag> \<newaosptag>

    (where oldaosptag is the original AOSP tag that was in .repo/manifests/default.xml)

    • Example invocation:

      ./lineage/scripts/aosp-merger/aosp-merger.sh merge android-8.0.0_r3 android-8.0.0_r30

  4. Every project in your tree should now be one of:

    • <newaosptag> if the project was tracking AOSP
    • a staging branch if the project was a fork from AOSP (check merged_repos.txt for status and whether there are conflicts to resolve)
    • the default repo lineage branch for .repo/manifests/snippets.xml projects

  5. Restore your local branches and merge in the staging branch:

    ./lineage/scripts/aosp-merger/branches_rebase.sh \<nameofstagingbranch>

    • Example invocation:

      ./lineage/scripts/aosp-merger/branches_rebase.sh staging/lineage-15.0_merge-android-8.0.0_r30

  6. Build, install, boot, verify, etc.

TODO

  • Make it work for rebase (I'm sure it'll need fixups).
  • Instead of merging the staging branch into your local branch (if you have one), create a new branch for the local+staging merge.