[LLVMdev] git branch release_31

[Sebastian Pop]

On Sun, May 6, 2012 at 10:20 AM, NAKAMURA Takumi <geek4civic at gmail.com> wrote:
> FYI, I have been maintaining my own release_31 manually on github.com/chapuni.
>

Thanks for the pointer.  I was waiting for Anton to fix the llvm.org
git repo for the 3.1 branch.

Anton, could you please try to fix the release_31 git branch?

Thanks,
Sebastian

> 2012/5/1 Sebastian Pop <spop at codeaurora.org>:
>> Hi Anton,
>>
>> git-svn got confused at the branch point for the release_31: I see
>> that the current release_31 branch has been created on r155051 as a
>> copy of r155050 from trunk, and r155050 is actually removing an older
>> release_31 branch:
>>
>> Revision 155050
>> Author:         void
>> Date:   Wed Apr 18 16:38:33 2012 CDT (11 days, 20 hours ago)
>> Log Message:    Removing old release_31 branch for rebranching.
>>
>> This "old release_31 branch" was created on r154899:
>>
>> Revision 154899
>> Author:         void
>> Date:   Mon Apr 16 21:00:08 2012 CDT (13 days, 16 hours ago)
>> Log Message:    Creating release_31 branch
>>
>>
>> Here is how I fixed this in my local git repo: looking at the last
>> commit to trunk r155049, before the "new release_31" has been created:
>>
>> commit bdcfb7663a2a62fd52a14dbeaa076423c719ec2d
>> Author: Bill Wendling <isanbard at gmail.com>
>> Date:   Wed Apr 18 21:38:12 2012 +0000
>>
>>    Add a flag to rebranch if we need to.
>>
>>    git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155049
>> 91177308-0d34-0410-b5e6-96231b3b80d8
>>
>> and the first commit that appears on the release_31 branch:
>>
>> commit 0d2807ae7060f6b0ffdf65b8606b2a6c61e1018a
>> Author: Bill Wendling <isanbard at gmail.com>
>> Date:   Fri Apr 20 20:32:47 2012 +0000
>>
>>    Merging r155230:
>>    ------------------------------------------------------------------------
>>    r155230 | void | 2012-04-20 13:31:44 -0700 (Fri, 20 Apr 2012) | 1 line
>>
>>    Modify the sh-bang to run out-of-the-box for FreeBSDes.
>>    ------------------------------------------------------------------------
>>
>>
>>    git-svn-id:
>> https://llvm.org/svn/llvm-project/llvm/branches/release_31@155231
>> 91177308-0d34-0410-b5e6-96231b3b80d8
>>
>> we can ask git to consider bdcfb7663a2a62fd52a14dbeaa076423c719ec2d as
>> the parent of 0d2807ae7060f6b0ffdf65b8606b2a6c61e1018a like this:
>>
>> # cd llvm
>> # echo "0d2807ae7060f6b0ffdf65b8606b2a6c61e1018a
>> bdcfb7663a2a62fd52a14dbeaa076423c719ec2d" > .git/info/grafts
>>
>> and then we can make this change permanent by rewriting the commits
>> in the release_31 branch:
>>
>> # git filter-branch --
>> bdcfb7663a2a62fd52a14dbeaa076423c719ec2d..remotes/origin/release_31
>>
>> Thanks,
>> Sebastian
>> --
>> Qualcomm Innovation Center, Inc is a member of Code Aurora Forum
>> _______________________________________________
>> LLVM Developers mailing list
>> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev
>
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev


--
Qualcomm Innovation Center, Inc is a member of Code Aurora Forum