Aquamacs branch

Aquamacs branch

[Eric S. Raymond]

I have been thinking about this and it appears to me that the map I
need to generate is not "all mirror hashes to all modified hashes" but
"all mirror hashes of merge-to-Aquamacs parents to corresponding
modified hashes". That should be good enough to knit the Aqumacs
branch back into the converted repo

I want to develop a repeatable procedure for this to use on other
private branches.

Is there someplace I can clone the Aquamacs repo from?
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

When your hammer is C++, everything begins to look like a thumb.
                -- Steve Hoflich on compl.lang.c++

Re: Aquamacs branch

[David Reitter]

[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]

Eric,

the official repository is:

https://github.com/davidswelt/aquamacs-emacs.git

The relevant branches are

Aquamacs3  [24-based]
Aquamacs2  [23-based]
Aquamacs22  [22-based]

(In the end, it would be nice to preserve the topic branches, but I don’t think it’s a big deal.  Everything else is certainly not worth the time.)

Note that this repository carries two copies of the Emacs history up to a few years back.  At that point, I had to switch to a different base Emacs, because the underlying repository rewrote history (or I switched from another mirror to the now-official one — I can’t quite remember).  I can help track this down.

Thanks for working on this.

- David



On Mar 7, 2014, at 3:54 AM, Eric S. Raymond <esr@thyrsus.com> wrote:

> I have been thinking about this and it appears to me that the map I
> need to generate is not "all mirror hashes to all modified hashes" but
> "all mirror hashes of merge-to-Aquamacs parents to corresponding
> modified hashes". That should be good enough to knit the Aqumacs
> branch back into the converted repo
> 
> I want to develop a repeatable procedure for this to use on other
> private branches.
> 
> Is there someplace I can clone the Aquamacs repo from?
> -- 
> 		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
> 
> When your hammer is C++, everything begins to look like a thumb.
>                -- Steve Hoflich on compl.lang.c++


[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4151 bytes --]

Re: Aquamacs branch

[Andreas Schwab]

David Reitter <david.reitter@gmail.com> writes:

> Note that this repository carries two copies of the Emacs history up to a few years back.  At that point, I had to switch to a different base Emacs, because the underlying repository rewrote history (or I switched from another mirror to the now-official one — I can’t quite remember).  I can help track this down.

That was the original repository I created while incrementally importing
the CVS repository vs. the current repository that was created from the
bzr repository.  Since the available features don't match 100% between
git and bzr the rewriting was inevitable.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Aquamacs branch

[Eric S. Raymond]

David Reitter <david.reitter@gmail.com>:
> Note that this repository carries two copies of the Emacs history up
> to a few years back.  At that point, I had to switch to a different
> base Emacs, because the underlying repository rewrote history (or I
> switched from another mirror to the now-official one — I can’t quite
> remember).  I can help track this down.
> 
> Thanks for working on this.

I've cloned your repository and looked at it. 

That is an *extremely* nasty mess you have there - not the code, but the
repo structure. The double tail of different Emacs histories introduces
complications I've never seen before.

My tools do not presently support a quick fix to this problem.  I
have a reposurgeon feature design in mind that might help. I'll need to do
some thinking and testing of it.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>