Loading sa5/generate_changemarks.sh +2 −2 Original line number Diff line number Diff line #!/bin/bash DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.4.0 DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.6.0 echo "\n------ Checking for docker image --------" docker pull "$DOCKER_IMAGE" Loading Loading @@ -29,7 +29,7 @@ echo "MERGE IID:" $3 echo "\n------ Generating change marks --------" #Using merge ID to get the diff docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$3" docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --filename --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$3" #Using the generated patch file from above (this approach eliminates the issue of diff limit #docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --patchfile "merge_patch.patch" --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3" Loading sa5/sa5_delimiter_end.docx −65 B (23.3 KiB) File changed.No diff preview for this file type. View original file View changed file sa5/sa5_delimiter_start.docx −75 B (23.3 KiB) File changed.No diff preview for this file type. View original file View changed file Loading
sa5/generate_changemarks.sh +2 −2 Original line number Diff line number Diff line #!/bin/bash DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.4.0 DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.6.0 echo "\n------ Checking for docker image --------" docker pull "$DOCKER_IMAGE" Loading Loading @@ -29,7 +29,7 @@ echo "MERGE IID:" $3 echo "\n------ Generating change marks --------" #Using merge ID to get the diff docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$3" docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --filename --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$3" #Using the generated patch file from above (this approach eliminates the issue of diff limit #docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --patchfile "merge_patch.patch" --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3" Loading
sa5/sa5_delimiter_end.docx −65 B (23.3 KiB) File changed.No diff preview for this file type. View original file View changed file
sa5/sa5_delimiter_start.docx −75 B (23.3 KiB) File changed.No diff preview for this file type. View original file View changed file