[llvm-dev] Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)

Thu Jun 2 21:46:55 PDT 2016

+1 for SmartGit, good for browsing the commit log, resolving conflicts or
staging code chunks in an editable 3-pane view.
Though I would fall back to the usual cli for everything else.

GitKraken also looks interesting, but I haven't used it enough to evaluate
it properly.

IMHO explorer integration is overrated and causes too much slow down &
instability.

On Fri, Jun 3, 2016 at 5:06 AM, Colin LeMahieu via llvm-dev <
llvm-dev at lists.llvm.org> wrote:

> I’ve had great success with SmartGit.  Since it’s java based it also works
> on the big-three of platforms.
>
>
>
> *From:* llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org] *On Behalf Of *Craig,
> Ben via llvm-dev
> *Sent:* Thursday, June 02, 2016 2:28 PM
>
> *To:* llvm-dev at lists.llvm.org
> *Subject:* Re: [llvm-dev] Switching to git (Windows experience) (was
> re:[cfe-dev] GitHub anyone?)
>
>
>
> One of the things that may taint my prior analysis...
>
> At the time I was last evaluating Windows git GUIs, I was looking for
> something that would make handling .patch and .diff files easier.  In
> particular, if a patch didn't apply, I really wanted to get some visual
> indication of which hunk failed, and some interface to resolve the
> conflict.  I didn't find any tools that handled that well.  Most tools
> didn't even expose 'git apply' in the UI at all.
>
> If .patch file workflows aren't expected to be the norm for llvm, then
> that feature isn't terribly important.  SourceTree may be a fine tool in
> that world.
>
> On 6/2/2016 12:50 PM, Robinson, Paul via llvm-dev wrote:
>
> We switched from SVN to git internally some time ago.  I polled our team
> in this morning's meeting. Some people who habitually work on Windows are
> using things like Sourcetree or gitk for browsing, but we're generally
> doing the "real" work from the command line.
>
> --paulr
>
>
>
> *From:* llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org
> <llvm-dev-bounces at lists.llvm.org>] *On Behalf Of *Chris Ray via llvm-dev
> *Sent:* Thursday, June 02, 2016 9:05 AM
> *To:* llvm-dev at lists.llvm.org
> *Subject:* Re: [llvm-dev] Switching to git (Windows experience) (was
> re:[cfe-dev] GitHub anyone?)
>
>
>
> Sourcetree is pretty good on windows, and I hear ok things about Git
> Extensions.  I have not used the GitHub app though.
>
>
>
> I typically use Sourcetree to view the logs, and command line for
> everything else.
>
>
>
> *From:* llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org
> <llvm-dev-bounces at lists.llvm.org>] *On Behalf Of *Craig, Ben via llvm-dev
> *Sent:* Thursday, June 02, 2016 10:01 AM
> *To:* llvm-dev at lists.llvm.org
> *Subject:* Re: [llvm-dev] Switching to git (Windows experience) (was
> re:[cfe-dev] GitHub anyone?)
>
>
>
> The GitHub app is ok.  Not great, but ok.  I guess this is one point in
> favor of GitHub vs. other git providers.  As a maintainer on a different
> project, I still had to jump out to the command line pretty frequently, as
> we had a squashed pull-request work flow.
>
> I did not have much success with git plugins for Visual Studio.  They
> seemed to be tuned towards in-tree builds.  I didn't spend enough time to
> figure out how to get them to work with out-of-tree builds.  More
> specifically, I recall that Visual Studio really expected the project and
> solution to be in source control, and in the same directory hierarchy as
> the source.  It's been a year since I've messed with them though, so things
> might have gotten better.
>
> On 6/2/2016 7:43 AM, Aaron Ballman via llvm-dev wrote:
>
> On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <renato.golin at linaro.org> <renato.golin at linaro.org> wrote:
>
> I think we should start two other threads: one about git tooling on Windows
>
> and one about infrastructure problems migrating to git.
>
>
>
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
>
> command line tools for version control. The last time I tried
>
> TortoiseGit on Windows (which was over a year ago), it did not feel
>
> ready for production use on a complex project to me (I had crashes on
>
> simple operations, and it seems I was not alone in seeing flaky
>
> behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
>
> https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).
>
>
>
> Are there suitable GUI tools for git on Windows for projects as
>
> complex as LLVM? I believe MSVC has some integration, but I've not
>
> used it before. Perhaps other tools exist that match the integration
>
> and stability that TortoiseSVN has with Explorer?
>
>
>
> I bring this up as a possible minor concern because asking people to
>
> switch from one set of command line commands to another set of command
>
> line commands is a different beast than asking people to switch from
>
> Explorer-integrated menus and dialogs to the command line (that's a
>
> drastically different workflow to achieve the same end result of
>
> source code version control).
>
>
>
> ~Aaron
>
> _______________________________________________
>
> LLVM Developers mailing list
>
> llvm-dev at lists.llvm.org
>
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
>
>
> --
>
> Employee of Qualcomm Innovation Center, Inc.
>
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
>
>
>
>
> _______________________________________________
>
> LLVM Developers mailing list
>
> llvm-dev at lists.llvm.org
>
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
>
>
> --
>
> Employee of Qualcomm Innovation Center, Inc.
>
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
>
>
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20160603/d8167460/attachment.html>