[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bug-zile] Rebasing Zi

From: Gary V. Vaughan
Subject: [Bug-zile] Rebasing Zi
Date: Tue, 10 Jan 2012 15:37:39 +0700

Hi Reuben,

I made a start at merging your recent lua work into the zi branch, but there are
a lot of fiddly conflicts in areas of the code that I haven't studied and don't
understand especially well yet... and I'm only a dozen patches in to your 
work! :-o

I think a saner way forward is for me to wait until you have the C and lua 
in sync (or at least until the next lua branch release if that comes sooner)...
forward port my keymapping improvements from current zi to that future lua 
tip, and then rewind the remaining zi branch in order to apply only the 
changesets onto the new lua HEAD revision.

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

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.


Gary V. Vaughan (gary AT gnu DOT org)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]