<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p>One of the things that may taint my prior analysis...</p>
<p>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.<br>
</p>
<p>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.<br>
</p>
<div class="moz-cite-prefix">On 6/2/2016 12:50 PM, Robinson, Paul
via llvm-dev wrote:<br>
</div>
<blockquote
cite="mid:E3B07FDB86BFF041819DC057DEED8FEAD2D49C7D@USCULXMSG08.am.sony.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";
color:black;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:12.0pt;
font-family:"Times New Roman","serif";
color:black;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0in;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";
color:black;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";
color:black;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;
color:black;}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:12.0pt;
font-family:"Times New Roman","serif";
color:black;}
span.EmailStyle21
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";
color:black;}
span.EmailStyle24
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">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.<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">--paulr<o:p></o:p></span></p>
<p class="MsoNormal"><a moz-do-not-send="true"
name="_MailEndCompose"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></a></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in
0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF
1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:windowtext">From:</span></b><span
style="font-size:10.0pt;font-family:"Tahoma","sans-serif";color:windowtext">
llvm-dev [<a class="moz-txt-link-freetext" href="mailto:llvm-dev-bounces@lists.llvm.org">mailto:llvm-dev-bounces@lists.llvm.org</a>]
<b>On Behalf Of </b>Chris Ray via llvm-dev<br>
<b>Sent:</b> Thursday, June 02, 2016 9:05 AM<br>
<b>To:</b> <a class="moz-txt-link-abbreviated" href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a><br>
<b>Subject:</b> Re: [llvm-dev] Switching to git
(Windows experience) (was re:[cfe-dev] GitHub anyone?)<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext">Sourcetree
is pretty good on windows, and I hear ok things about Git
Extensions. I have not used the GitHub app though.<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext"><o:p> </o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext">I
typically use Sourcetree to view the logs, and command
line for everything else.<o:p></o:p></span></p>
<p class="MsoNormal"><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1
1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext">From:</span></b><span
style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:windowtext">
llvm-dev [<a moz-do-not-send="true"
href="mailto:llvm-dev-bounces@lists.llvm.org">mailto:llvm-dev-bounces@lists.llvm.org</a>]
<b>On Behalf Of </b>Craig, Ben via llvm-dev<br>
<b>Sent:</b> Thursday, June 02, 2016 10:01 AM<br>
<b>To:</b> <a moz-do-not-send="true"
href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a><br>
<b>Subject:</b> Re: [llvm-dev] Switching to git
(Windows experience) (was re:[cfe-dev] GitHub anyone?)<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p>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.<o:p></o:p></p>
<p>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.<o:p></o:p></p>
<div>
<p class="MsoNormal">On 6/2/2016 7:43 AM, Aaron Ballman via
llvm-dev wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<pre>On Wed, Jun 1, 2016 at 6:31 PM, Renato Golin <a moz-do-not-send="true" href="mailto:renato.golin@linaro.org"><renato.golin@linaro.org></a> wrote:<o:p></o:p></pre>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<pre>I think we should start two other threads: one about git tooling on Windows<o:p></o:p></pre>
<pre>and one about infrastructure problems migrating to git.<o:p></o:p></pre>
</blockquote>
<pre><o:p> </o:p></pre>
<pre>Some developers on Windows prefer to use GUI tools like TortoiseSVN to<o:p></o:p></pre>
<pre>command line tools for version control. The last time I tried<o:p></o:p></pre>
<pre>TortoiseGit on Windows (which was over a year ago), it did not feel<o:p></o:p></pre>
<pre>ready for production use on a complex project to me (I had crashes on<o:p></o:p></pre>
<pre>simple operations, and it seems I was not alone in seeing flaky<o:p></o:p></pre>
<pre>behavior: <a moz-do-not-send="true" href="https://gitlab.com/tortoisegit/tortoisegit/issues/1738">https://gitlab.com/tortoisegit/tortoisegit/issues/1738</a> and<o:p></o:p></pre>
<pre><a moz-do-not-send="true" href="https://gitlab.com/tortoisegit/tortoisegit/issues/2494">https://gitlab.com/tortoisegit/tortoisegit/issues/2494</a> as examples).<o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<pre>Are there suitable GUI tools for git on Windows for projects as<o:p></o:p></pre>
<pre>complex as LLVM? I believe MSVC has some integration, but I've not<o:p></o:p></pre>
<pre>used it before. Perhaps other tools exist that match the integration<o:p></o:p></pre>
<pre>and stability that TortoiseSVN has with Explorer?<o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<pre>I bring this up as a possible minor concern because asking people to<o:p></o:p></pre>
<pre>switch from one set of command line commands to another set of command<o:p></o:p></pre>
<pre>line commands is a different beast than asking people to switch from<o:p></o:p></pre>
<pre>Explorer-integrated menus and dialogs to the command line (that's a<o:p></o:p></pre>
<pre>drastically different workflow to achieve the same end result of<o:p></o:p></pre>
<pre>source code version control).<o:p></o:p></pre>
<pre><o:p> </o:p></pre>
<pre>~Aaron<o:p></o:p></pre>
<pre>_______________________________________________<o:p></o:p></pre>
<pre>LLVM Developers mailing list<o:p></o:p></pre>
<pre><a moz-do-not-send="true" href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a><o:p></o:p></pre>
<pre><a moz-do-not-send="true" href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><o:p></o:p></pre>
</blockquote>
<p class="MsoNormal" style="margin-bottom:12.0pt"><o:p> </o:p></p>
<pre>-- <o:p></o:p></pre>
<pre>Employee of Qualcomm Innovation Center, Inc.<o:p></o:p></pre>
<pre>Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project<o:p></o:p></pre>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
LLVM Developers mailing list
<a class="moz-txt-link-abbreviated" href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>
<a class="moz-txt-link-freetext" href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
</pre>
</body>
</html>