@@ -157,6 +157,8 @@ function pick_unmerged_commits {
157157 repopick -f -t n-asb-2024-05 || exit 1
158158 # 2024-06-05
159159 repopick -f -t n-asb-2024-06 || exit 1
160+ # 2024-07-05
161+ repopick -f -t n-asb-2024-07 || exit 1
160162 # tzdb2021c_N
161163 repopick -f -t tzdb_N || exit 1
162164 echo
@@ -232,6 +234,8 @@ function pick_unmerged_commits {
232234 repopick -f -t P_asb_2024-05 || exit 1
233235 # 2024-06-05
234236 repopick -f -t P_asb_2024-06 || exit 1
237+ # 2024-07-05
238+ repopick -f -t P_asb_2024-07 || exit 1
235239 echo
236240 fi
237241 if [ " ${rev} " == " 17.1" ]; then
@@ -291,6 +295,10 @@ function pick_unmerged_commits {
291295 repopick -f -t Q_asb_2024-04 || exit 1
292296 # 2024-05-05
293297 repopick -f -t Q_asb_2024-05 || exit 1
298+ # 2024-06-05
299+ repopick -f -t Q_asb_2024-06 || exit 1
300+ # 2024-05-07
301+ repopick -f -t Q_asb_2024-07 || exit 1
294302 echo
295303 fi
296304 if [ " ${rev} " == " 18.1" ]; then
@@ -306,35 +314,37 @@ function pick_unmerged_commits {
306314 repopick -t R_asb_2024-05 || exit 1
307315 # 2024-06-05
308316 repopick -t R_asb_2024-06 || exit 1
317+ # 2024-07-05
318+ repopick -t R_asb_2024-07 || exit 1
309319 echo
310320 fi
311321 if [ " ${rev} " == " 19.1" ]; then
312322 echo
313- # 2024-06 -05
314- repopick -f 394523 || exit 1
315- cp -v ./android/default.xml ./.repo/manifests/ || exit 1
316- repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
317- repopick -t S_asb_2024-06 || exit 1
323+ # 2024-07 -05
324+ # repopick -f 394523 || exit 1
325+ # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
326+ # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
327+ repopick -t S_asb_2024-07 || exit 1
318328 echo
319329 fi
320330 if [ " ${rev} " == " 20.0" ]; then
321331 echo
322- # 2024-06 -05
323- repopick -f 394238 || exit 1
324- cp -v ./android/default.xml ./.repo/manifests/ || exit 1
325- repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
326- repopick -p -t T_asb_2024-06 || exit 1
332+ # 2024-07 -05
333+ # repopick -f 394238 || exit 1
334+ # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
335+ # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
336+ repopick -p -t T_asb_2024-07 || exit 1
327337 echo
328338 fi
329339 if [ " ${rev} " == " 21.0" ]; then
330340 echo
331- # 2024-06 -05
332- # repopick -f 388588 || exit 1
333- # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
334- # cp -v ./android/snippets/lineage.xml ./.repo/manifests/snippets/ || exit 1
335- # cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
336- # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 || exit 1
337- repopick -p -t U_asb_2024-06 || exit 1
341+ # 2024-07 -05
342+ repopick -f 396638 || exit 1
343+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
344+ cp -v ./android/snippets/lineage.xml ./.repo/manifests/snippets/ || exit 1
345+ cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
346+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 || exit 1
347+ repopick -p -t U_asb_2024-07 || exit 1
338348 echo
339349 fi
340350 return 0
0 commit comments