Michael Bestas
d9c87a53d5
aosp-merger: Abandon staging branch inside _merge_helper
...
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
2023-03-21 04:59:43 +05:30
Michael Bestas
c44154f25c
aosp-merger: Switch all scripts to argument parsing
...
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
2023-03-21 04:59:43 +05:30
Michael Bestas
b92af37df1
aosp-merger: Adapt for LineageOS vars usage
...
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
2023-03-21 04:59:43 +05:30
Chirayu Desai
adcf6fca04
aosp-merger: Prepare for device merging
...
Change-Id: Ifcd99f733b3c7e2cc3969e10b7a7247ecbe34678
2023-03-21 04:59:43 +05:30
Chirayu Desai
f1363b6619
aosp-merger: remove merged_repos.txt early
...
* To be able to re-run the script cleanly
Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
2023-03-21 04:59:43 +05:30
Michael Bestas
788196f219
aosp-merger: Fix merged_repos.txt handling after refactor
...
Change-Id: I8719e4ab8ddd043eefc1e0c1dca9d427b0f0cc7e
2023-03-21 04:59:43 +05:30
Michael Bestas
6fb4c9a940
aosp-merger: allow running from any directory
...
Change-Id: I14907315ed2e9fcbc3db7bcb0a74e3d5e00c68c8
2023-03-21 04:59:43 +05:30
Michael Bestas
f5199e1afa
aosp-merger: Add script that merges non-forked repositories
...
* Useful to find differences and potential missing commits
between AOSP tags with different ancestor on repositories
that we have not forked.
One example is this month, switching from Pixel 6
December 2021 tag to qcom Pixel January 2022 tag.
Change-Id: Ib5bafd50c20375368255ad9bbb8ca702c3361652
2023-03-21 04:59:43 +05:30
