Re: [Bug-zile] Rebasing Zi

[Reuben Thomas]

On 10 January 2012 08:37, Gary V. Vaughan <address@hidden> wrote:
> Hi Reuben,
>
> I think a saner way forward is for me to wait until you have the C and lua 
> branches
> in sync

Yes, that's best: I'm working pretty fast at present, and I'm just
getting to the last major code change (new buffer structure) now.

> Do you have any objections to changing history in the zi branch by rewinding 
> and
> rebasing the differences like this?

None.

> Actually, now that I think about it, until such point as the zi branch 
> diverges
> significantly from the lua branch, I'm pretty sure we can save a lot of 
> merging
> and syncing between the two by declaring the zi branch rewindable and then I 
> can
> just rebase it onto the current lua HEAD from time to time to pick up recent
> improvements on the lua branch.
>
> WDYT?

AFAIK you're the only one working on that branch, so I'm quite happy with that.

-- 
http://rrt.sc3d.org