Re: [Gnu-arch-users] merging two projects

[James Blackwell]

In lists.arch.users, you wrote:
>
> Let's say I have a project named `emacs' and a smaller project named `url'
> and I want to merge them by adding `url' into my `emacs' project.
> More specifically all the files of `url' will appear under emacs/lisp/url.
>
> Things I know I could do:
> - copy only the files and lose the revision history.
> - use configs so I can just put `url' as a subtree without atually merging
>   the two projects.

In my humble opinion, those are the two easy answers. Either any given
file is new to the archive, or its not part of that particular archive
in the first place.

> but I would really much rather keep the thing as a single project (without
> a config) especially since I might want later on to move some files out-of
> and into emacs/lisp/url (and thus lose the clean separation between the
> two).

If you really, really want to maintain the history of B in A, then
here's what you need to do: 

For each patch in B (base-0 -- patch-current, inclusive)
 a. replay that B patch in A
 b. commit the A branch


Of course there's a whole bunch of gotchas involved. Off the top of my
head, here's some: 

1. You're going to have problems if the tagging method isn't compatible

2. If either of the projects have files or directories with the same
name, you're going to end up with a mess on your hands.




-- 
James Blackwell      Using I.T. to bring more             570-407-0488
Owner, Inframix      business to your business     http://inframix.com

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400