[Paraview-developers] git process

Wed Mar 7 15:41:39 EST 2012

Oh wow, you have changes all over the place! :). For any changes to
kwsys/vtkmetaio, you'll have to send emails to Brad King and get your
changes approved and merged. Developers are not allowed to change
those shared/core files directly.

Utkarsh

On Wed, Mar 7, 2012 at 2:37 PM, burlen <burlen.loring at gmail.com> wrote:
> Hi Utkarsh,
>
> If I'm understanding the instructions correctly, I make a branch in my VTK
> folder first, commit changes, then pvvtk-push? When attempting pvvtk-push I
> got the following error: commit 3c144e30 not allowed: only
> kwrobot at kitware.com may publish ('Utilities/kwsys/',
> 'Utilities/vtkmetaio/'). Have I done something wrong? or is it it not
> allowed to modify Utilities/kwsys on a topic branch? complete output
> follows.
>
> Thanks
> Burlen
>
> missmarple:/work/ext/ParaView/ParaView-git-mem-insp/ParaView$cd VTK
> missmarple:/work/ext/ParaView/ParaView-git-mem-insp/ParaView/VTK$git
> checkout mem-insp-tree
> Already on 'mem-insp-tree'
> missmarple:/work/ext/ParaView/ParaView-git-mem-insp/ParaView/VTK$git prepush
> * commit 5f4fb2c21173bf8d6d24c2c3d1432a65d7f19505
> | Author: Burlen Loring <bloring at lbl.gov>
> | Date:   Wed Mar 7 11:14:50 2012 -0800
> |
> |     mem-insp-tree
> |
> |     Some updates to further support ParaView memory inspector panel. Added
> a method to return the host's FQDN, and methods to test for OS type(Windows,
> Apple, linux). Removed debugging cruft.
> |
> |     Change-Id: I139871e81b568fce1bf1c5aaae388486789d1096
>
>  Utilities/kwsys/SystemInformation.cxx    |  201
> +++++++++++++++++++++++-------
>  Utilities/kwsys/SystemInformation.hxx.in |    5 +
>  2 files changed, 159 insertions(+), 47 deletions(-)
> |
> * commit 3c144e3061c67f629a334fe69fa6440a3ceabc9f
>  Author: Burlen Loring <bloring at lbl.gov>
>  Date:   Fri Mar 2 13:54:00 2012 -0800
>
>      mem-insp-tree
>
>      Updates to kwsys SystemInformation to support probing of the current
> processes
>      memory usage in KB(linux,win,mac), the total physical memory in
> KB(linux,win,mac),
>      and to report the model name field of the cpuinfo(linux only). bug fix
> to vtkSocket
>      where error return in recv was ignored on mac and linux.
>
>  Common/vtkSocket.cxx                     |   20 +-
>  Utilities/kwsys/CMakeLists.txt           |    1 +
>  Utilities/kwsys/SystemInformation.cxx    | 1118
> ++++++++++++++++++++++--------
>  Utilities/kwsys/SystemInformation.hxx.in |   37 +-
>  4 files changed, 888 insertions(+), 288 deletions(-)
> missmarple:/work/ext/ParaView/ParaView-git-mem-insp/ParaView/VTK$git
> pvvtk-push
> remote: Counting objects: 527, done.
> remote: Compressing objects: 100% (184/184), done.
> remote: Total 476 (delta 348), reused 407 (delta 292)
> Receiving objects: 100% (476/476), 161.60 KiB, done.
> Resolving deltas: 100% (348/348), completed with 17 local objects.
> From git://paraview.org/PVVTK
>  * [new branch]      12741-fix-installing-vtk-python-shared-libraries ->
> pvvtk/12741-fix-installing-vtk-python-shared-libraries
>  * [new branch]      ghost-data -> pvvtk/ghost-data
>  * [new branch]      master     -> pvvtk/master
>  * [new branch]      minimize_memory -> pvvtk/minimize_memory
>  * [new branch]      nightly-pv-next -> pvvtk/nightly-pv-next
>  * [new branch]      predicate-selections -> pvvtk/predicate-selections
>  * [new branch]      predicate_selections_tests ->
> pvvtk/predicate_selections_tests
>  * [new branch]      pv-master  -> pvvtk/pv-master
>  * [new branch]      pv-next    -> pvvtk/pv-next
> Counting objects: 23, done.
> Delta compression using up to 16 threads.
> Compressing objects: 100% (15/15), done.
> Writing objects: 100% (15/15), 8.57 KiB, done.
> Total 15 (delta 13), reused 0 (delta 0)
> From ../VTK
>   f629814..33a7e59  master     -> master
> ----------------------------------------------------------------------
> commit 3c144e30 not allowed: only kwrobot at kitware.com may publish
> ('Utilities/kwsys/', 'Utilities/vtkmetaio/')
> ----------------------------------------------------------------------
> error: hook declined to update refs/heads/mem-insp-tree
> To git at paraview.org:PVVTK.git
>  ! [remote rejected] HEAD -> mem-insp-tree (hook declined)
> error: failed to push some refs to 'git at paraview.org:PVVTK.git'
>
>
> On 03/02/2012 02:11 PM, Utkarsh Ayachit wrote:
>>
>> Burlen,
>>
>> I'd undo the last two steps i.e. add VTK to paraview and rebase paraview.
>>
>> Then, assuming you don't have any other commits changing VTK in your
>> Paraview topic, you can rebase paraview and the create the new commit
>> to update the VTK.
>>
>> You're getting the conflict since VTK has been modified in
>> origin/master as well as your new commit created by step #4.
>>
>> Utkarsh
>>
>> On Fri, Mar 2, 2012 at 11:30 AM, burlen<burlen.loring at gmail.com>  wrote:
>>>
>>> Hi,
>>>
>>> I made some changes to the Memory Inspector in ParaView so that it
>>> reports
>>> the per process usage and would like to follow the git work flow to
>>> submit
>>> them. I am confused about how I should handle the changes inside VTK. I
>>> did
>>> read the wiki on this, but it's a little light on the details given my
>>> level
>>> of git experience.
>>>
>>> here is what I did that didn't work,
>>>
>>> made a topic branch in ParaView, modified files, added files, commit
>>> made a topic branch in VTK, modified files, added files, commit
>>> switch to VTK master, pull , switch to my vtk topic, rebase master
>>> switch to PV topic, add VTK, commit
>>> switch to PV master, pull, switch to my pv topic, rebase master
>>>
>>> the last step failed with the following message:
>>>
>>> Auto-merging VTK
>>> CONFLICT (submodule): Merge conflict in VTK
>>> Failed to merge in the changes.
>>>
>>> I think my mistake was to pull and rebase vtk master? Any advise on
>>> cleaning
>>> it up? In my PV topic do I add VTK or is that already handled by actions
>>> on
>>> my vtk topic branch?
>>>
>>> Thanks
>>> Burlen
>>>
>>>
>>>
>>> _______________________________________________
>>> Paraview-developers mailing list
>>> Paraview-developers at paraview.org
>>> http://public.kitware.com/mailman/listinfo/paraview-developers
>
>