[Aquamacs-devel] Bidi issues in Aquamacs24 branch

[Ze'ev Clementson]

Hi David,

Another question: I had assumed that Aquamacs was composed of the
Emacs source tree plus the aquamacs directory plus a symbolic link to
the build-aquamacs file. So, I copied the aquamacs directory into the
bzr emacs directory that I downloaded, added the build-aquamacs
symbolic link and ran it. The resulting app was not the same as the
aquamacs24 app that I built from the aquamacs24 branch. Are there
additional bits and pieces that are added to the base emacs download
that I missed?

Thanks,
Ze'ev

On Mon, Jul 5, 2010 at 8:06 AM, Ze'ev Clementson <beresheit at gmail.com> wrote:
> Hi David,
>
> On Mon, Jul 5, 2010 at 5:30 AM, David Reitter <david.reitter at gmail.com> wrote:
>> On Jul 5, 2010, at 1:26 AM, Ze'ev Clementson wrote:
>>>
>>> Could one of the aquamacs maintainers (David?) please comment on how
>>> frequently the aquamacs24 branch is refreshed from the emacs24 sources
>>> and when the next resync is likely to occur?
>>
>> This happens maybe once every other month, and it depends on "git-merge" correctly determining the changes.  By looking at the history for the Aquamacs24 branch, you should be able to determine when the last merge happened.
>
> How do I look "at the history for the Aquamacs24 branch"? If I scan
> the comments in the online history, it would appear that branch
> emacs24 was merged into aquamacs24 on May 12 and branch Master was
> merged into aquamcs24 on June 21. Could the emacs24 merges been
> overwritten by the Master merges?
>
>> I don't know why the latest changes haven't been merged in.
>>
>> If you or someone else here would volunteer to figure this out and to maintain merges (at any frequency), then that would be a big help.
>
> I don't use git often enough to be familiar with anything other than
> the basic operations, so I am not the best person to be responsible
> for the merge. However, if there are instructions or scripts available
> for setting this up from scratch, I'm happy to test it on my Mac to
> see if it works ok for me; however, it would be better if someone with
> more git-savvy could do this. The emacs24 development is done from
> bazaar, so (presumably) you must have created a git emacs24 repository
> that you populate from bzr and you then merge that into the aquamacs24
> git branch?
>
> - Ze'ev
>



-- 
Ze'ev