[Freeipa-devel] Proposal to reset master branch

[Adam Young]

On 08/03/2010 01:53 PM, Adam Young wrote:
> Proposal to reset master branch to last known good commit prior to the 
> merge of the web UI code.
>
> Since the push on Friday complicates the source tree unnecessarily, 
> making it difficult to track actual change4s done as well as to 
> reproduce the current state of the tree, I propose the following.
>
>
> The current master branch gets tagged as webui-details on commit 
> 47d4fcdd8178ec4b8403efa4f80eaa009c32d78b
>
>
> We then reset the HEAD of master to commit 
> d4adbc8052faf18fb31e7b1865037aa107067d4b
>
> (Add container and initial ACIs for entitlement support)
>
> The impact would be minimal:  it would only affect active developers  
> that have pulled from the FreeeIPA git repo since the push happened.  
> Since there has been a reversing commit on top of that, any code that 
> they have should rebase equally well on top of either branch, since 
> the code they expose is identical.
>
>
>
> Here are the git commands that would be executed on the repository.  
> This would be run on the server where the git repo is hosted in order 
> to have the desired effect, so they would be manipulating local 
> branches, not remote.
>
>
> git  --git-dir=$REPODIR   branch -m master webui-details
> git --git-dir=$REPODIR   branch master 
> d4adbc8052faf18fb31e7b1865037aa107067d4b
> |
> |
> Please respond to support or reject this proposal.  Nothing will 
> happen until I have project sign-off.
>
>
> _______________________________________________
> Freeipa-devel mailing list
> Freeipa-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/freeipa-devel

Unless someone objects, I am going to reset the master branch to the 
commit d4adbc8052faf18fb31e7b1865037aa107067d4b at 2 PM Eastern Time today


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20100805/7ffd6a86/attachment.htm>