[Paraview-developers] stage/gerrit/confusion

[Biddiscombe, John A.]

Apologies, I've read through all the stuff about paraview/develop and how to push branches to stage etc, but nowhere is gerrit mentioned, and when I look on gerrit, the branches there are all completely different from the stage branches.

If we're supposed to use this gerrit thing, then why is there no mention of it anywhere in the paraview wiki? Where can I find instructions on how to see my branches in gerrit? (Seems like there are two systems and they're unrelated).

Thanks

JB


From: paraview-developers-bounces at paraview.org [mailto:paraview-developers-bounces at paraview.org] On Behalf Of Biddiscombe, John A.
Sent: 09 November 2012 17:01
To: Utkarsh Ayachit; ParaView Developers
Subject: Re: [Paraview-developers] ParaView Gatekeeper Review Summary

I pushed some branches to stage about 6 months ago but never quite finished the final steps to get them into a release.

I now want to revive those branches and get them into 3.98 if possible.

topic_commandproperty_314 -> stage/topic_commandproperty_314
topic_stringlist_regex -> stage/topic_stringlist_regex

Should I rebase them onto master or the rc3.98 tag?. I have finally managed to get a gerrit account (I had to register with google though), so in principle I can be a developer again.

If I would like to rebase these branches, is it ok, or should I instead merge them with master? I'm looking at the http://www.paraview.org/Wiki/KWSys/Git/Develop page for guidance, but I'll do it wonrg first time anyway, so I'm hoping  someone will tell me before hand :)

Thanks

JB



From: paraview-developers-bounces at paraview.org<mailto:paraview-developers-bounces at paraview.org> [mailto:paraview-developers-bounces at paraview.org] On Behalf Of Utkarsh Ayachit
Sent: 09 November 2012 16:10
To: ParaView Developers
Subject: [Paraview-developers] ParaView Gatekeeper Review Summary

Topics merged into master
-----------------------------------------------

0008427-fix-and-improve-quality-of-movies
0013636-fix-cross-compilation
0013637-fix-and-improve-pvsc-files
13497_coprocessing_script_generation
13592-GL2PSCompression
13601-RuntimeMatplotlibCheck
add-catalyst-dir
add-paraview-git-describe
cataylst-depends
fix-contour-cases
fix_generated_doc
fix_representation_example
mesa-specular-color-workaround
move-vtksmpwriterproxy
python-optional-modules
python-optional-modules-2
remove_superbuild_files
suppress-import-errors
suppress-proxy-error
timekeeper-core-move
update_version_numbe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20121109/6d7b733e/attachment.htm>