On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote:> Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there. >I recommend updating the merge.sh script to use `git cherry-pick -x` and then deleting the merge-git.sh script. -Tom> On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org>> wrote: > > Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____ > > _______________________________________________ > LLVM Developers mailing list > llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev > > > > _______________________________________________ > LLVM Developers mailing list > llvm-dev at lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev >
Hans Wennborg via llvm-dev
2020-Jan-16 14:55 UTC
[llvm-dev] Merge script for Git monorepo?
Any objection to deleting both and just using get cherry-pick -x directly? On Thu, Jan 16, 2020 at 2:27 AM Tom Stellard via llvm-dev <llvm-dev at lists.llvm.org> wrote:> > On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote: > > Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there. > > > > I recommend updating the merge.sh script to use `git cherry-pick -x` > and then deleting the merge-git.sh script. > > -Tom > > > On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org>> wrote: > > > > Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____ > > > > _______________________________________________ > > LLVM Developers mailing list > > llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org> > > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev > > > > > > > > _______________________________________________ > > LLVM Developers mailing list > > llvm-dev at lists.llvm.org > > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev > > > > _______________________________________________ > LLVM Developers mailing list > llvm-dev at lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
On 01/16/2020 06:55 AM, Hans Wennborg wrote:> Any objection to deleting both and just using get cherry-pick -x directly? >That's fine with me too. -Tom> On Thu, Jan 16, 2020 at 2:27 AM Tom Stellard via llvm-dev > <llvm-dev at lists.llvm.org> wrote: >> >> On 01/15/2020 05:03 PM, Reid Kleckner via llvm-dev wrote: >>> Tom Stellard told me to use `git cherry-pick -x`, and if you look at the release branches, you can see it is used, although the old style is used as well. I'm not sure what script is being used there. >>> >> >> I recommend updating the merge.sh script to use `git cherry-pick -x` >> and then deleting the merge-git.sh script. >> >> -Tom >> >>> On Wed, Jan 15, 2020 at 4:54 PM Shoaib Meenai via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org>> wrote: >>> >>> Now that we’re on the Git monorepo, is there an updated script for cherry-picking commits into the release branch? llvm/utils/release/merge.sh appears to still use SVN, and llvm/utils/release/merge-git.sh uses git-svn.____ >>> >>> _______________________________________________ >>> LLVM Developers mailing list >>> llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org> >>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev >>> >>> >>> >>> _______________________________________________ >>> LLVM Developers mailing list >>> llvm-dev at lists.llvm.org >>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev >>> >> >> _______________________________________________ >> LLVM Developers mailing list >> llvm-dev at lists.llvm.org >> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev >