[Aquamacs-devel] Bidi issues in Aquamacs24 branch

[Ze'ev Clementson]

On Mon, Jul 5, 2010 at 2:27 PM, David Reitter <david.reitter at gmail.com> wrote:
> On Jul 5, 2010, at 11:06 AM, Ze'ev Clementson wrote:
>>
>> 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?
>
> Possible - I'm not fully confident in Git's ability to handle that.
>
>>
>> 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.
>
> Unfortunately, I hear that a lot these days.  Would it be possible that you - or somebody else - read the relevant parts of the Git manual / man pages to see how a "merge" is done?

I like aquamacs; however, I don't currently have the time to take an
active part in it's development (especially if it involves spending
additional time learning git, which I only use sporadically and
superficially).

>> 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;
>
> I'm afraid I don't see how that would be helping things along.

I originally posted my question to this list because there was a bidi
error reported on the emacs-bidi list by an aquamacs24 user and we
wanted to determine whether the issue was aquamacs related. If I can
merge the current emacs24 code with aquamacs and run the test locally
on my Mac, we can determine whether the current emacs24 bidi code
works ok in aquamacs. This won't solve your issue of getting someone
to do the aquamacs24 merges, but my original question to this list was
an attempt to determine whether a bidi issue was resolved by the
current code in the emacs24 branch when run under Aquamacs.

> What one would need to do is to go over the merged code to find out which changes have been done compared to Emacs24, and to check that these changes were introduced by Aquamacs rather than any other merge.

That's why I suggested doing it on my Mac. I'm not asking anyone else
to do extra work to "fix" the merge process. I just want to know how
the merge is supposed to work so that I can try it locally and see
whether the bidi code works properly or not.

>> 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?
>
> Everything that I merge comes from  git://repo.or.cz/emacs.git  these days - this is an up-to-date git mirror of the original Emacs branches in bzr.
> So that makes things very easy.  Everything stays in Git.

That's good to know. Downloading emacs24 from bazaar took ages last
night and I know even less about bazaar than I do git!

Thanks,
Ze'ev