Re: Half-baked unused features.

[David Kastrup]

Carl Sorensen <address@hidden> writes:

> On 8/15/10 9:14 AM, "David Kastrup" <address@hidden> wrote:
>
>> 
>> The development work should go up to Rietveld, the cleanup should go up
>> to Rietveld.  git-cl can associate only one review per branch.  So I
>> need to fork out the cleanup from the middle of the branch.  Possibly by
>> rebasing it to the tip of the branch and then creating a branch from
>> HEAD~1, cherrypicking HEAD.  No wait, more likely to the bottom and then
>> just labelling a new branch there.  Whatever.  I'll figure it out.
>
> if it were me, I'd create a new branch, then chop out all the old stuff.
> Then create a new branch from the cleaned branch, which will be the
> development branch.
>
> Now you've got the cleaned branch available for the Rietveld review, and the
> development branch available for review relative to the cleaned branch.
> Both reviews are easily maintainable; if you update the cleaned branch, you
> just rebase the development branch.

The cleanup, among other things, basically changes

(define ...
   (if some-condition
       whatever-and-quite-long
       whatever-else)
)

into

(define ...
   whatever-and-quite-long
)

Since all the other work is going on in whatever-and-quite-long, and
since the cleanup changes its indentation, every rebase affects the
whole area repeatedly and will require manual conflict resolution.

"just rebase" is a mess for that reason.

-- 
David Kastrup