[cfe-dev] GitHub anyone?

[Florent Castelli via cfe-dev]

My company is using submodules for the better or worse. It's not a perfect
solution but it can work when using a version of git recent enough and some
tooling.

The magic command to update everything to the current commit pointed by
each submodule : git submodules update --init --recursive
To get the latest version you can do: git submodules --init --recursive
--remote
This by default will get the latest version of master, but a change in the
.gitmodules file can make it point to release branches.

If you want a stable version from days ago, you can have a bot updating the
submodules everyday and pushing the submodules update, then use that
commit.
With a bot like this, manual submodule bumps should be rare and people non
familiar with git will soon forget about those.

For a linear history, you can have GitHub doing a rebase when merging the
changes instead of a merge. I would recommend to do that to keep the
history clean and have less "fixup" or "wip" commits in the history.

For the people who want to keep SVN, I've tried the compatibility layer
from GitHub and it worked well enough for me in the past. But I would
recommend to write a cheat sheet to help people migrate to Git long-term.
Recent versions of git are not as hard to use as the old versions of git
and it doesn't have to be more complicated than SVN.

/Florent
On May 31, 2016 22:43, "Aaron Ballman via cfe-dev" <cfe-dev at lists.llvm.org>
wrote:

> On Tue, May 31, 2016 at 4:27 PM, Renato Golin <renato.golin at linaro.org>
> wrote:
> > On 31 May 2016 at 21:24, Aaron Ballman <aaron at aaronballman.com> wrote:
> >> Are we sure that github's svn integration works with common tools on
> >> Windows, like TortoiseSVN?
> >
> > That's a good question. Can you try them out and report back?
>
> From my very simple testing, yes. However, since I don't use github
> for much, it's hard to feel comfortable with my level of testing. I'm
> sure for read-only access, this will be sufficient. For read/write
> access, I am less confident, so if others have had more experience
> with this on Windows, I would appreciate hearing about it.
>
> ~Aaron
> _______________________________________________
> cfe-dev mailing list
> cfe-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20160531/aea3dd54/attachment.html>