Skip to content

Commit

Permalink
adapt packing to PR CL#960
Browse files Browse the repository at this point in the history
  • Loading branch information
@SunSerega
SunSerega committed Sep 1, 2024
1 parent a6b735e commit 66b311b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DataScraping/Reps/OpenCL-Docs
Submodule OpenCL-Docs updated from bfd9a6 to ce0e12
8 changes: 4 additions & 4 deletions LastPack.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Compiling "DataScraping/Reps/PullReps.pas"
Compiling: OK
Runing SubReps Update
SubReps Update: Pulling OpenCL
SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
SubReps Update: cmd /c "(echo [checkout] && git checkout pretest/960 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/960) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
SubReps Update: OpenCL[OUT] : [checkout]
SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/custom'.
SubReps Update: OpenCL[OUT] : Already on 'custom'
SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/pretest/960'.
SubReps Update: OpenCL[OUT] : Already on 'pretest/960'
SubReps Update: OpenCL[OUT] : [pull-own]:
SubReps Update: OpenCL[ERR] : From SunSerega/OpenCL-Docs
SubReps Update: OpenCL[ERR] : * branch custom -> FETCH_HEAD
SubReps Update: OpenCL[ERR] : * branch pretest/960 -> FETCH_HEAD
SubReps Update: OpenCL[OUT] : Already up to date.
SubReps Update: OpenCL[OUT] : [fetch-main]
SubReps Update: OpenCL[OUT] : [merge-main]
Expand Down
8 changes: 4 additions & 4 deletions Log/PullUpstream.log
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update Reps ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Runing SubReps Update
SubReps Update: Pulling OpenCL
SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
SubReps Update: cmd /c "(echo [checkout] && git checkout pretest/960 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/960) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
SubReps Update: OpenCL[OUT] : [checkout]
SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/custom'.
SubReps Update: OpenCL[OUT] : Already on 'custom'
SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/pretest/960'.
SubReps Update: OpenCL[OUT] : Already on 'pretest/960'
SubReps Update: OpenCL[OUT] : [pull-own]:
SubReps Update: OpenCL[ERR] : From SunSerega/OpenCL-Docs
SubReps Update: OpenCL[ERR] : * branch custom -> FETCH_HEAD
SubReps Update: OpenCL[ERR] : * branch pretest/960 -> FETCH_HEAD
SubReps Update: OpenCL[OUT] : Already up to date.
SubReps Update: OpenCL[OUT] : [fetch-main]
SubReps Update: OpenCL[OUT] : [merge-main]
Expand Down

0 comments on commit 66b311b

Please sign in to comment.