[dev] [commits] Horde-Hatchery branch master updated. d3fcd5cdd11ada51d44c03fccd529ba9beed543d

[Michael M Slusarz]

Quoting Jan Schneider <jan at horde.org>:

> Zitat von Michael M Slusarz <slusarz at horde.org>:
>>
>> 1. Go to horde-git:master. Make sure it is updated.
>> 2. Do 'git checkout -b tmp  
>> 5d259f069ca8c31700d5431a595d2e3b5d961ea9'  This creates a temporary  
>> branch and sets HEAD to right before IMP was imported.
>> 3. Do 'git fetch <path to horde-hatchery> master:hatchery'  <path  
>> to horde-hatchery> can be the filepath to the hatchery repo on the  
>> local machine.  This pulls in all of hatchery's history to horde-git.
>> 4. Do 'git merge <path to horde-hatchery>'  There will be at least  
>> one conflict that needs to be resolved (.gitignore).
>> 5. Do 'git merge master'.  This should merge all changes done to  
>> horde-git after 12/23/2009 (when IMP was added).  There will be at  
>> least two conflicts that need to be resolved  
>> (.gitattributes/.gitignore)
>> 6. Now 'tmp' contains the full, combined history of horde-git and  
>> horde-hatchery.
>
> Great, (with a Patrick Stewart voice) make it so ;-) Though we might  
> want to do this after we agreed whether we want a single repository  
> for all framework and application code.

Yeah - I'm not going to do this yet without further input.  Two things  
I didn't mention: this above method doesn't remove the "moving imp to  
horde-git" and "imported imp from horde-hatchery" commits.  Not really  
any need to keep these around - and this is probably one of the few  
valid reasons to modify the commit history.  Also, this method doesn't  
add the branches currently present in horde-hatchery.  It will  
probably be easiest to recreate these branches by creating a new  
branch in horde-git and then cherry-picking (or equivalent) the  
commits from the topic branch in horde-hatchery.

michael

-- 
___________________________________
Michael Slusarz [slusarz at horde.org]