Hi David,<div><br></div><div><div class="gmail_quote">On Wed, May 26, 2010 at 5:46 PM, David Gobbi <span dir="ltr"><<a href="mailto:david.gobbi@gmail.com">david.gobbi@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Thanks for doing this! I was not looking forward to doing the<br>
clean-up work myself... when I started it never occurred to me to<br>
create a branch, my plan was to eventually re-base my changes on the<br>
VTK master.<br></blockquote><div><br></div><div>Topic branches are much easier for us to work with, and if you avoid merging into them/rebasing then the eventual merge into master becomes simpler. Now that we have it you could continue your work in that branch, or we could cherry pick the commits you make.</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
There are just two minor changes that I can squeeze in over the next<br>
two days, and I will email you when they are done. After that, the<br>
sooner that the branch can be merged into master, the better. In<br>
order for the special-type wrapping to be fully realized, most (or<br>
all) of the BTX's will have to be removed from the code. A change<br>
that big will probably be easier to do in the master than to merge in<br>
from a branch.<br></blockquote><div><br></div><div>A global change like that is definitely something that would be easier done in master as you say. We can take care of that once it looks ready to go in. </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
I've already tested VTK (with python, tcl, and java) without BTX/ETX.<br>
The Tcl and Java wrappers compiled and tested cleanly, and so did<br>
Python after I did some small fixes to the way that it does special<br>
type wrapping. It is these python fixes that I need to commit before<br>
the merge.<br>
<br></blockquote><div>I think one of the remaining concerns is how much the wrapping might diverge, i.e. if Python supports vtkVariant, unicode, vtkStdString etc but other languages did not. I am certainly very pleased with the changes in Python, and can see how much it will improve the Python wrapping in charts and infovis.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
There are other changes that I'm planning for the Python wrappers<br>
(enums, etc) but for them I'd prefer to wait until after the merge.<br>
I'll put together a wiki page so that they can be reviewed.<br><br></blockquote><div>You could publish them in a topic branch for us to review. The main caveats remain to avoid rebasing/merging from master. Once we are ready to merge into master we can take care of that. Thanks for putting this together, and to Keith for preparing this topic branch.</div>
<div><br></div><div>I am very hopeful that we can merge these changes in soon. We have been working away behind the scenes to get this ready to be reviewed and merged in.</div><div><br></div><div>Thanks,</div><div><br></div>
<div>Marcus </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div><div class="h5"><br>
On Wed, May 26, 2010 at 2:39 PM, Keith Fieldhouse<br>
<<a href="mailto:keith.fieldhouse@kitware.com">keith.fieldhouse@kitware.com</a>> wrote:<br>
> David<br>
> I've been spending some time looking at your Wrapping work. It appears that<br>
> your git tree was built with a mixture of rebasing and merging which<br>
> resulted in a somewhat wonky commit history (duplicated commits interspersed<br>
> with commits coming from VTK master).<br>
> In order to get a clean topic branch that will be a little easier for folks<br>
> here to look at (and to eventually merge with master) I spent a bit of time<br>
> untangling your history (mostly by examining parentage and looking at commit<br>
> subjects). In the end, by cherry picking the right commits in what I<br>
> considered the "right" order I was able to build a clean topic branch with<br>
> no conflicts. Once I had that, I rebased it against master (as of this<br>
> afternoon sometime when I did it). The result can be found in<br>
> git://<a href="http://github.com/keith-fieldhouse/VTK.git" target="_blank">github.com/keith-fieldhouse/VTK.git</a><br>
> As the topic branch Gobbi/Wrapping.<br>
> The result builds and the tests run so I believe that I've built a a<br>
> representative branch from your work.<br>
> If you plan on doing additional work on this, would it be possible for you<br>
> to grab this topic branch and work on that (without rebasing or merging for<br>
> now)? That way we'll have a clean topic branch for an eventual merge to<br>
> "Next" when we switch to branchy development for VTK. Or if branchy<br>
> development comes later, this clean topic branch will be easier to rebase as<br>
> well.<br>
> Thanks again for your work on this.<br>
> Keith<br>
> --<br>
> Keith Fieldhouse<br>
> R&D Engineer, Kitware Inc.<br>
> (518) 836-2190<br>
><br>
><br>
><br>
><br>
</div></div></blockquote></div><br></div>