| Re: [cdt-dev] combining git repositories |
> Do I need another clone?Yes - I have not merged old versions of the code. So before current master you need two clones still (of the same repo).Note the reason that git checkout of LAUNCHBAR_2_4_0 showed other stuff is probably due to ignored files. I can see the "bundles" and "repo" directories in your listing for the launchbar.Here is my run of similar commands (with a clean/reset to start it off):$ git checkout master
Previous HEAD position was fb05ee51d8 [releng] Bump plug-in version number for bug fix in Bug 549066
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
$ git clean -dfx ; git reset --hard HEAD
HEAD is now at 168a6c1156 Bug 551817 - Add missing CONTRIBUTING file to CDT
$ git checkout cdt_9_9
Switched to branch 'cdt_9_9'
Your branch is up-to-date with 'origin/cdt_9_9'.
$ ls
build codan core cross debug disable_intro_in_tests.ini doc dsf dsf-gdb jtag launch llvm lrparser lsp memory native pom.xml qt releng remote testsrunner toolchains upc util visualizer windows xlc
$ git checkout LAUNCHBAR_2_4_0
Note: switching to 'LAUNCHBAR_2_4_0'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at fb05ee51d8 [releng] Bump plug-in version number for bug fix in Bug 549066
$ ls
bundles features pom.xml repo testsHTH,JonahOn Fri, 17 Jan 2020 at 10:58, Alena Laskavaia <elaskavaia.cdt@xxxxxxxxx> wrote:Maybe I am looking at wrong place?Before I checked out cdt_9_9 branch, the content of my source tree was like thatelaskavaia@elaskavaia-linux2:~/git/org.eclipse.cdt$ ls
build disable_intro_in_tests.ini launch native testsrunner windows
codan doc llvm pom.xml toolchains xlc
core dsf lrparser qt upc
cross dsf-gdb lsp releng util
debug jtag memory remote visualizer(No launchbar)No I checked out LAUNCHBAR_2_4_0laskavaia@elaskavaia-linux2:~/git/org.eclipse.cdt$ ls
build codan debug dsf-gdb launch pom.xml repo testsrunner
bundles core dsf features llvm qt tests utilIts less stuff and no launchbar againAnd now I checked out master to compareelaskavaia@elaskavaia-linux2:~/git/org.eclipse.cdt$ ls
build doc lrparser releng visualizer
codan dsf lsp remote windows
CONTRIBUTING.md dsf-gdb memory testsrunner xlc
core jtag native toolchains
cross launch pom.xml tools.templates
debug launchbar qt upc
disable_intro_in_tests.ini llvm README.md utilSo launchbar is there.So how I suppose to have baseline contains cdt_9_9 and matching launchbar in one source tree? Do I need another clone?On Fri, Jan 17, 2020 at 10:36 AM Jonah Graham <jonah@xxxxxxxxxxxxxxxx> wrote:Hi Alena,I added the missing tags (LAUNCHBAR_2_4_1) to the org.eclipse.cdt repo. Please checkout the appropriate tag, CDT 9.9 was released with Launchbar 2.4.0 (tag LAUNCHBAR_2_4_0)The only changes between 2.4.0 and 2.4.1 are code cleaning and fixing up licenses (Bugs 553230 and 553231) and releng work.The tags are still in the old repo too, but as all the history has moved it made sense to move the tags too. At some point those old repos can/will be deleted.HTH,JonahOn Fri, 17 Jan 2020 at 09:57, Alena Laskavaia <elaskavaia.cdt@xxxxxxxxx> wrote:I cannot figure out how to get launchbar anymore. I checkout branch 9_9 of cdt that we use. But it does not have lunchbar.Do I keep using old repository to get launchbar that was shipped with that version? How do I know what version it was?_______________________________________________On Tue, Jan 14, 2020 at 11:58 AM Jonah Graham <jonah@xxxxxxxxxxxxxxxx> wrote:Hello folks,The git repositories are now combined. If you have any questions please let me know.Jonah_______________________________________________On Wed, 18 Dec 2019 at 14:55, Jonah Graham <jonah@xxxxxxxxxxxxxxxx> wrote:Hello folks,I would like to combine the main CDT git repo, launchbar and tools.templates repo. At the moment I am spending quite a bit of time simply managing three git repos, with three p2 deployments, simrel contributions, etc. Most of the nearly 100 items on the endgame plan need to be done for each of the repos.Originally when launchbar and tools.template were created I believe there was the hope that they would be adopted by projects or otherwise move higher in the tool stack. There hasn't been much movement in that direction, so as CDT is likely to be the home for these for the foreseeable future I propose having only 1 git repo and corresponding p2 repo. The git history will be preserved by merging the different git repos together. The names of the plug-ins are not changing and if someone in the future wants to move launchbar or tools.templates to a new home we can do that then.To that end I have created Bug 558439 and made a branch that does combine all these things. My intention is to merge that branch into master in the coming days, but I want to allow some time for objections or comments first, so I won't do it this week to allow enough time for comments.Thank you,Jonah
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://www.eclipse.org/mailman/listinfo/cdt-dev
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://www.eclipse.org/mailman/listinfo/cdt-dev