[LLVMdev] Policy and advise for working with LLVM release branch with git-svn

[Reid Kleckner]

The usual approach is to commit to trunk and request a merge (I suppose a
cherry-pick in git parlance) of the relevant changes.  I expect for this
kind of thing that Bill would be OK with you doing the merge yourself.


On Tue, Jul 22, 2014 at 7:27 AM, Dan Liew <dan at su-root.co.uk> wrote:

> Hi,
>
> I noticed that the LLVM 3.5 release branch landed recently.
>
> I have a few patches (these are all part of my recent work to fix up
> the CMake interface) that I'd like in both LLVM3.5 release branch and
> trunk that I'd like to commit
>
> Is there any policy on how should do this be done, or can I just
> commit the patch to both trunk and then the release branch with
> identical commit messages? Or should these be the same commit (I think
> SVN lets you do this...)
>
> I'm also currently using git-svn to push to trunk by following [1].
> There isn't any advise there about working with the release branches.
> I have never pushed to a svn branch from git-svn before I'd like to
> not screw this up.
>
> Should I
>
> - Just use svn for committing to the release branch
> - Create a new git repository on my local machine and set it up in [1]
> but use the release URL instead of trunk
> - Do some kind of magic so I can continue to use existing LLVM git
> repository and be able to push either trunk or the release branch
> - Something else...
> ?
>
> [1]
> http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-git-svn
>
> Thanks,
> Dan
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20140722/959e7453/attachment.html>