{"thread":{"id":"50348","subject":"[PATCH 0/1] Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'","startedAt":"2019-01-29T10:56:05Z","lastAt":"2019-01-29T17:50:44Z","messageCount":3,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"367943","messageId":"pull.113.git.gitgitgadget@gmail.com","threadId":"50348","inReplyTo":null,"subject":"[PATCH 0/1] Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-29T10:56:01Z","receivedAt":"2019-01-29T10:56:05Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"There are merge conflicts that do not result in merge conflict markers: e.g.\nwhen one branch extends a function's signature, and another branch adds a\ncaller.\n\nIn this instance, sg/travis-specific-cc wants to use gcc-8 in the osx-gcc \njob (which is already installed, but not linked, on Travis' macOS agents),\nand js/vsts-ci wants to run the tests on Azure Pipelines (where gcc-8 is not\ninstalled by default).\n\nSo this fixup is necessary to fix that conflict.\n\nTo see that this is necessary, I kicked off a public build and you can see\nthe symptom of the problem here\n[https://dev.azure.com/git/git/_build/results?buildId=318&view=logs&jobId=51041795-01c5-57f3-5561-107b6b9e51a6&taskId=fadc714a-a906-5cf2-cc7a-335e443ad2f8&lineStart=326&lineEnd=327&colStart=1&colEnd=71]\n.\n\nJohannes Schindelin (1):\n  fixup! Merge branch 'js/vsts-ci' into pu\n\n ci/lib.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\nbase-commit: c7baf85843ec1dc8272483baa2f84d0ec66ad882\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-113%2Fdscho%2Fosx-gcc%408-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-113/dscho/osx-gcc@8-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/113\n-- \ngitgitgadget\n"},{"id":"367944","messageId":"946d5637f10d25ca7addbe376ead053be569c5e8.1548759361.git.gitgitgadget@gmail.com","threadId":"50348","inReplyTo":"pull.113.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] fixup! Merge branch 'js/vsts-ci' into pu","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-01-29T10:56:02Z","receivedAt":"2019-01-29T10:56:05Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThe js/vsts-ci and sg/travis-specific-cc branches do not interact so\nwell... While Travis has the Homebrew package gcc@8 installed in their\nXcode 10.1 images, Azure Pipelines' agents do not.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n ci/lib.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/ci/lib.sh b/ci/lib.sh\nindex 276b99693d..16f4ecbc67 100755\n--- a/ci/lib.sh\n+++ b/ci/lib.sh\n@@ -123,7 +123,7 @@ then\n \t\techo \"$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1\"\n \t}\n \n-\tBREW_INSTALL_PACKAGES=\n+\tBREW_INSTALL_PACKAGES=gcc@8\n \texport GIT_PROVE_OPTS=\"--timer --jobs 10 --state=failed,slow,save\"\n \texport GIT_TEST_OPTS=\"--verbose-log -x --write-junit-xml\"\n \texport MAKEFLAGS=\"--jobs=10\"\n-- \ngitgitgadget\n"},{"id":"368023","messageId":"xmqqimy78ia8.fsf@gitster-ct.c.googlers.com","threadId":"50348","inReplyTo":"946d5637f10d25ca7addbe376ead053be569c5e8.1548759361.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] fixup! Merge branch 'js/vsts-ci' into pu","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-01-29T17:50:39Z","receivedAt":"2019-01-29T17:50:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> The js/vsts-ci and sg/travis-specific-cc branches do not interact so\n> well... While Travis has the Homebrew package gcc@8 installed in their\n> Xcode 10.1 images, Azure Pipelines' agents do not.\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>  ci/lib.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n\nThanks; will use as a merge-fix/ recipe (assuming that sg/travis\nwould graduate before vsts-ci).\n\n> diff --git a/ci/lib.sh b/ci/lib.sh\n> index 276b99693d..16f4ecbc67 100755\n> --- a/ci/lib.sh\n> +++ b/ci/lib.sh\n> @@ -123,7 +123,7 @@ then\n>  \t\techo \"$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1\"\n>  \t}\n>  \n> -\tBREW_INSTALL_PACKAGES=\n> +\tBREW_INSTALL_PACKAGES=gcc@8\n>  \texport GIT_PROVE_OPTS=\"--timer --jobs 10 --state=failed,slow,save\"\n>  \texport GIT_TEST_OPTS=\"--verbose-log -x --write-junit-xml\"\n>  \texport MAKEFLAGS=\"--jobs=10\"\n"}]}