[Aquamacs-devel] Bidi issues in Aquamacs24 branch

[David Reitter]

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?

> 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.

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.

> 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.

- David