[Aquamacs-devel] Bidi issues in Aquamacs24 branch

[Ze'ev Clementson]

Hi David,

On Mon, Jul 5, 2010 at 8:38 PM, David Reitter <david.reitter at gmail.com> wrote:
> On Jul 5, 2010, at 6:43 PM, Ze'ev Clementson wrote:
>> So when you do a merge from emacs24, are you manually resolving the
>> discrepancies between the emacs code and your custom code?
>
> Yes.  I do "git merge emacs24" and resolve conflicts (there are many), usually using "git mergetool".  Same for "git merge master" to merge in changes on the master branch.
>
> Of course this is a bit tricky, and I am afraid that errors will creep up during that process.
>
>> Also, are the changes maintained in any publicly-accessible repository?
>
> Yes, of course.  All code is in the Aquamacs git repository; the nightly builds are only produced from code in these branches.
>
> The changes are direct changes to the code; we do not have "patch sets", even though you could of course extract such patch sets with git quite easily.
>
> Hope that helps, and that you can figure this out.

I was hoping the process would be a bit more straight-forward.
Presumably the next emacs24/aquamacs24 merge will occur in the next
month or two so I'll wait for that (or until someone else does a
merge).

-- 
Ze'ev