I hope I didn't overcomplicate things, but I genuinely believe this will make the merging easier.
Don't worry, I'm not suggesting to integrate Visualization as a git submodules in the future. I don't even like handling that myself. The submodule allows me to simulate a Nebula repository that already contains a widgets/visualization sub-directory, without bulk-commits or structure changes. The advantage: Once I can provide a patch, you should be able to merge it without conflicts, and the build just works. :-) You won't have to add arbitrary sequences of "../" to xml-files or merge tree-conflicts. The same goes for me, when I merge upstream changes. I promise, my patch will be submodule-free! If you have problems updating it in your clone, I'd recommend to re-clone it each time something has changed. Cheers Max On Sun, 22 Sep 2013, Wim Jongman wrote: > Max, I don't want to break the structure of the current repo with one > exception. We all should be in our own repo or we should all be in the > same. It is probably not a bad idea to put every widget in its own repo at > some point in the future but I think we must stay away from submodules.Here > are some rants about git submodules. > > Cheers, > > Wim > > http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ > http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/ > http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/ > > > On Tue, Sep 17, 2013 at 2:48 PM, Wim Jongman <[email protected]> wrote: > > > Thanks Max! We have already decided to move the visualization widgets to > > the release build so they have to be moved. > > > > Cheers, > > > > Wim > > > > > > On Tue, Sep 17, 2013 at 9:18 AM, Max Hohenegger > > <[email protected]>wrote: > > > >> Hi, > >> > >> I added the Visualization plug-ins SWT-XY-Graph and Widgets > >> to the incubation update-site build. If you want to have look: > >> $ git clone > >> https://github.com/Treehopper/visualization.git > >> $ cd nebula/releng/org.eclipse.nebula.updatesite.incubation > >> $ mvn clean install > >> Remember to use Maven 3.0.x: > >> https://bugs.eclipse.org/bugs/show_bug.cgi?id=406056 > >> > >> Notice that I added the Visualization project as a git submodule in > >> widgets/visualization, in case you want to work with a clone/fork. > >> I did this to avoid introducing any difficult-to-merge structural > >> changes. > >> > >> Let me know if you have any objections. Otherwise I will keep > >> adjusting the build to upstream-changes until it is ready for the > >> Nebula repository. > >> @Xihui, ping me, if the contribution to the example view is ready > >> for the build, or if I can help with that as well. > >> > >> Cheers > >> Max > >> > >> On Fri, 13 Sep 2013, Wim Jongman wrote: > >> > moving this discussion to nebula-dev > >> > > >> > Thanks Max for chipping in. Tt is greatly appreciated. Are you aware > >> that > >> > we have a pretty solid build already in Nebula? Since Xihui's widgets > >> will > >> > be included in the release build they have to be included there as well. > >> > > >> > Please take a look at our contribution page on how new contributions > >> must > >> > be formatted and how to take part in the build. > >> > > >> > http://wiki.eclipse.org/Nebula/New_Contributions > >> > > >> > Regardless where the contribution is done, I still need a bug in > >> bugzilla > >> > to track your contributions. You should add the bug in the commit > >> message > >> > of the commits that you make. Please file a bug against Nebula/releng in > >> > order to track your contribution. > >> > > >> > Thanks again for helping, > >> > > >> > Wim > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > > >> > On Fri, Sep 13, 2013 at 9:57 AM, Max Hohenegger <[email protected]> > >> wrote: > >> > > >> > > Hi, > >> > > > >> > > I forked the repository on github and will have a first look at it > >> > > today. > >> > > > >> > > @Wim, I mean the Nebula build. I was hoping to use the official p2 > >> > > update-site to consume the visualization project as soon as possible. > >> > > Sorry for the confusion. I think I only offered my help in a separate > >> > > mail to Xihui. > >> > > > >> > > I think I remember Wayne Beaton mentioning that github pull requests > >> > > can be accessed in the Eclipse Gerrit, but I'm not sure how to do > >> that. > >> > > So I will just keep pulling changes from your repo, work on the build, > >> > > and if you let me know when you are ready to push to Nebula, I'll > >> attach > >> > > a patch with my changes in Bugzilla. > >> > > What do you think? > >> > > > >> > > Cheers > >> > > Max > >> > > > >> > > On Thu, 12 Sep 2013, Wim Jongman wrote: > >> > > > > > >> > > > > > >> > > > > Thanks for willing to help the Visualization project! Wim has > >> ported > >> > > it to > >> > > > > github for initial polishing: > >> > > > > https://github.com/wimjongman/visualization?source=c You may > >> setup > >> > > the > >> > > > > Tycho build from there, but you may need to follow the Nebula > >> build > >> > > rules > >> > > > > that I'm not familiar with yet. Wim, if possible, could you grant > >> Max > >> > > the > >> > > > > push privilege? > >> > > > > > >> > > > > >> > > > I don't think I am able to do that. I have to make sure that all > >> > > > contributions coming from non-Nebula committers go through bugzilla > >> or > >> > > > Gerrit. > >> > > > >> _______________________________________________ > >> nebula-dev mailing list > >> [email protected] > >> https://dev.eclipse.org/mailman/listinfo/nebula-dev > >> > > > > _______________________________________________ nebula-dev mailing list [email protected] https://dev.eclipse.org/mailman/listinfo/nebula-dev
