[security-dev] PicketLink restructure

[Pete Muir]

A plain old git merge would keep the history. A git filter-branch would have been able to rewrite the history to make it look like you were always in the repo. You could always sort this out now - delete what is there, commit it, and then do the merge. Keep a branch with any new patches on, and cherry pick them in.

On 3 Oct 2012, at 08:06, Anil Saldhana wrote:

> Shane,
>   ahh.  You could not wait a day or two. :)  I am wondering if we could have retained history via some form of "git mv".
> 
> We should probably have PicketLink version as 3.0 for all the code and rather than do individual releases, we can do a collective PL3.x release.
> 
> Cheers.
> 
> On 10/02/2012 04:56 AM, Boleslaw Dawidowicz wrote:
>> I restored our branches and synced with Shane on IM. 
>> 
>> picketlink-idm/master will be nuked and only contain some README pointing to new locations
>> 
>> Current picketlink-idm repo will be kept for few more months at least and after we are in more calm situation with GateIn/EPP it will be renamed into picketlink-idm-legacy. 
>> 
>> Things under control :)
>> 
>> Bolek
>> 
>> On Oct 2, 2012, at 11:08 AM, Boleslaw Dawidowicz <bdawidow at redhat.com> wrote:
>> 
>>> I must say I'm quite pissed off… even yesterday I shared a link to one of configuration files in 1.4 branch with a consultants. We released twice last month… how could have it happened without any question?
>>> 
>>> 
>>> On Oct 2, 2012, at 11:06 AM, Boleslaw Dawidowicz <bdawidow at redhat.com> wrote:
>>> 
>>>> Have you just removed picketlink-idm on github?
>>>> 
>>>> We are actively working on 1.4 branch and this is critical for EPP. Other branches are still maintenance for older versions of GateIn/EPP. I think I was fairly clear that we need those. 
>>>> 
>>>> This repo needs to be restored ASAP. 
>>>> 
>>>> On Oct 2, 2012, at 12:30 AM, Shane Bryzak <sbryzak at redhat.com> wrote:
>>>> 
>>>>> In the interests of presenting a clear message to our developers, one of the steps we'll be taking is to consolidate the various PicketLink projects into a single project and presenting this as the "go to" solution for application security.  For now I've merged the CDI and IDM subprojects (these are now submodules of the PicketLink project, with "CDI" renamed to "Core") and the plan is to eventually merge the social and federation modules also.
>>>>> 
>>>>> You can find the new GitHub repository here: https://github.com/picketlink (renamed from picketlink-cdi) and the picketlink-idm repository has now been deleted.  For anyone working on these modules, please use the new repository from now on.
>>>>> 
>>>>> Thanks!
>>>>> Shane
> 
> _______________________________________________
> security-dev mailing list
> security-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/security-dev