[vtk-developers] Confusion over Tcl 8.6 patches

[David Gobbi]

Don't rewrite the history.  It isn't the order of commits or anything
like that that concerns me, just time spent.

On Tue, Nov 19, 2013 at 11:32 AM, David E DeMarle
<dave.demarle at kitware.com> wrote:
> Gerrit didn't know that the old topic should be merged onto the release-5.10
> branch, and it complained when I tried to do it within gerrit.
>
> So I cherry picked the old topic
> (http://review.source.kitware.com/#/t/2360/) onto a new topic
> (http://review.source.kitware.com/#/t/3623/) and then merged that one though
> gerrit instead.
>
> In hindsight that was a mistake on my part. Sorry. If you like (because
> other work depends on those original commits for example), I'll see about
> rewriting the last few minutes of history.
>
>
>
>
> David E DeMarle
> Kitware, Inc.
> R&D Engineer
> 21 Corporate Drive
> Clifton Park, NY 12065-8662
> Phone: 518-881-4909
>
>
> On Tue, Nov 19, 2013 at 11:15 AM, David Gobbi <david.gobbi at gmail.com> wrote:
>>
>> I don't understand what you mean by "wanted to be sure"... parentage
>> in git is explicit and is laid down in stone.
>>
>> The reason that I am concerned is that it was a lot of work to make
>> sure that the old release-tcl86_update branch could be merged cleanly
>> into both release (which was VTK 5.10.1 at the time, this was in March
>> 2013) and master (which had been modularized).
>>
>> Now, it seems that my efforts from last March were for nothing,
>> because you have re-backported a patch that was already clearly based
>> off of the exactly the tip of the current release-5.10 branch.
>>
>>
>> On Tue, Nov 19, 2013 at 11:02 AM, David E DeMarle
>> <dave.demarle at kitware.com> wrote:
>> > You are right I probably could have just merged it directly.
>> >
>> > Since the gerrit topic was started before there was a release-5.10
>> > branch, I
>> > did it this way because I wanted to be sure that gerrit and origin
>> > pointed
>> > to the same thing.
>> >
>> > David E DeMarle
>> > Kitware, Inc.
>> > R&D Engineer
>> > 21 Corporate Drive
>> > Clifton Park, NY 12065-8662
>> > Phone: 518-881-4909
>> >
>> >
>> > On Tue, Nov 19, 2013 at 10:29 AM, David Gobbi <david.gobbi at gmail.com>
>> > wrote:
>> >>
>> >> I'm confused... why is there a new patch on gerrit for the Tcl 8.6
>> >> patches?
>> >>
>> >> The existing Tcl 8.6 patch (see link below) is already based on VTK
>> >> 5.10.1.  It just has to be merged into the VTK 5.10 release branch:
>> >> http://review.source.kitware.com/#/t/2360/
>> >>
>> >> There must be something that I'm not understanding here...
>> >>
>> >>   David
>> >
>> >
>
>