<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
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:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
p.Code, li.Code, div.Code
{mso-style-name:Code;
mso-style-link:"Code Char";
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Courier New";}
span.CodeChar
{mso-style-name:"Code Char";
mso-style-link:Code;
font-family:"Courier New";}
span.EmailStyle20
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
.MsoPapDefault
{mso-style-type:export-only;
margin-top:6.0pt;
margin-right:0cm;
margin-bottom:6.0pt;
margin-left:0cm;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
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]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US">Thanks that worked. Now it fails in a new way! “Cherry pick failed”.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US">What now?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US">Simon<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">simonpj@cam-05-unx:~/code/HEAD-5$ arc patch D1069<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">arc patch D1069<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">You have untracked files in this working copy.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> Working copy: /home/simonpj/code/HEAD-5/<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> Untracked changes in working copy:<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> (To ignore these changes, add them to ".git/info/exclude".)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> D1069-patch<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> Foo<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> compiler/basicTypes/T7287.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> foo<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> libraries/integer-gmp2/GNUmakefile<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> libraries/integer-gmp2/ghc.mk<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> spj-patch<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T2604.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T2604.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T5863a.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T5863a.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T7800.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/deriving/should_fail/T7800.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> testsuite/tests/typecheck/should_compile/T9999.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> typeable-msg<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> Ignore these untracked files and continue? [y/N] y<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">y<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Branch name arcpatch-D1069 already exists; trying a new name.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Branch name arcpatch-D1069_1 already exists; trying a new name.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Created and checked out branch arcpatch-D1069_2.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Created and checked out branch arcpatch-D1033.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch utils/haddock...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch testsuite/tests/driver/T4437.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch testsuite/tests/deSugar/should_run/all.T...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch testsuite/tests/deSugar/should_run/DsStrictData.stdout...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch testsuite/tests/deSugar/should_run/DsStrictData.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch docs/users_guide/glasgow_exts.xml...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch docs/users_guide/flags.xml...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/vectorise/Vectorise/Generic/PData.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/typecheck/TcTyClsDecls.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/typecheck/TcSplice.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/typecheck/TcRnDriver.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/typecheck/TcExpr.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/prelude/TysWiredIn.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/parser/RdrHsSyn.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/parser/Parser.y...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/main/DynFlags.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/iface/TcIface.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/iface/MkIface.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/iface/BuildTyCl.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/hsSyn/HsTypes.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/hsSyn/Convert.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/deSugar/DsMeta.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/basicTypes/MkId.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Checking patch compiler/basicTypes/DataCon.hs...<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">warning: unable to rmdir utils/haddock: Directory not empty<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch utils/haddock cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch testsuite/tests/driver/T4437.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch testsuite/tests/deSugar/should_run/all.T cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch testsuite/tests/deSugar/should_run/DsStrictData.stdout cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch testsuite/tests/deSugar/should_run/DsStrictData.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch docs/users_guide/glasgow_exts.xml cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch docs/users_guide/flags.xml cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/vectorise/Vectorise/Generic/PData.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/typecheck/TcTyClsDecls.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/typecheck/TcSplice.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/typecheck/TcRnDriver.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/typecheck/TcExpr.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/prelude/TysWiredIn.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/parser/RdrHsSyn.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/parser/Parser.y cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/main/DynFlags.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/iface/TcIface.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/iface/MkIface.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/iface/BuildTyCl.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/hsSyn/HsTypes.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/hsSyn/Convert.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/deSugar/DsMeta.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/basicTypes/MkId.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Applied patch compiler/basicTypes/DataCon.hs cleanly.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libffi-tarballs' () registered for path 'libffi-tarballs'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/Cabal' () registered for path 'libraries/Cabal'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/Win32' () registered for path 'libraries/Win32'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/array' () registered for path 'libraries/array'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/binary' () registered for path 'libraries/binary'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/bytestring' () registered for path 'libraries/bytestring'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/containers' () registered for path 'libraries/containers'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/deepseq' () registered for path 'libraries/deepseq'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/directory' () registered for path 'libraries/directory'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/dph' () registered for path 'libraries/dph'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/filepath' () registered for path 'libraries/filepath'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/haskeline' () registered for path 'libraries/haskeline'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/hoopl' () registered for path 'libraries/hoopl'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/hpc' () registered for path 'libraries/hpc'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/parallel' () registered for path 'libraries/parallel'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/pretty' () registered for path 'libraries/pretty'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/primitive' () registered for path 'libraries/primitive'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/process' () registered for path 'libraries/process'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/random' () registered for path 'libraries/random'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/stm' () registered for path 'libraries/stm'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/terminfo' () registered for path 'libraries/terminfo'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/time' () registered for path 'libraries/time'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/transformers' () registered for path 'libraries/transformers'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/unix' () registered for path 'libraries/unix'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/vector' () registered for path 'libraries/vector'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'libraries/xhtml' () registered for path 'libraries/xhtml'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'nofib' () registered for path 'nofib'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'utils/haddock' () registered for path 'utils/haddock'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule 'utils/hsc2hs' () registered for path 'utils/hsc2hs'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule path 'libraries/array': checked out '604afd531aba4a96b066f6e59a08813107a9eed3'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule path 'libraries/parallel': checked out 'e4e4228ba94178cf31b97fe81b94bff3de6fce03'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Submodule path 'utils/haddock': checked out '5eb0785cde60997f072c3bdfefaf8c389c96d42e'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Cherry Pick Failed!<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Exception<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Command failed with error #1!<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">COMMAND<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">git cherry-pick 'arcpatch-D1033'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">STDOUT<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># On branch arcpatch-D1069_2<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># Changes not staged for commit:<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># (use "git add <file>..." to update what will be committed)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># (use "git checkout -- <file>..." to discard changes in working directory)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">#<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># modified: libraries/array (new commits)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># modified: libraries/parallel (new commits)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># modified: utils/haddock (new commits)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">#<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># Untracked files:<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># (use "git add <file>..." to include in what will be committed)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">#<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># D1069-patch<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># Foo<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># compiler/basicTypes/T7287.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># foo<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># libraries/integer-gmp2/<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># spj-patch<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T2604.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T2604.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T5863a.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T5863a.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T7800.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/deriving/should_fail/T7800.stderr<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># testsuite/tests/typecheck/should_compile/T9999.hs<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"># typeable-msg<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">no changes added to commit (use "git add" and/or "git commit -a")<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">STDERR<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">The previous cherry-pick is now empty, possibly due to conflict resolution.<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">If you wish to commit it anyway, use:<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"> git commit --allow-empty<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">Otherwise, please use 'git reset'<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">(Run with `--trace` for a full exception trace.)<o:p></o:p></span></p>
<p class="Code"><span style="mso-fareast-language:EN-US">49simonpj@cam-05-unx:~/code/HEAD-5$<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Reid Barton [mailto:rwbarton@gmail.com]
<br>
<b>Sent:</b> 05 August 2015 17:13<br>
<b>To:</b> Thomas Miedema<br>
<b>Cc:</b> Simon Peyton Jones; ghc-devs<br>
<b>Subject:</b> Re: arc patch<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:12.0pt;margin-left:0cm">
It's actually "arc upgrade". I added a mention of this command to the wiki:<br>
<a href="https://ghc.haskell.org/trac/ghc/wiki/Phabricator#HelpImgettingastrangeerrorwhenrunningarcthatIdidntgetyesterday">https://ghc.haskell.org/trac/ghc/wiki/Phabricator#HelpImgettingastrangeerrorwhenrunningarcthatIdidntgetyesterday</a><o:p></o:p></p>
</div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
Regards,<o:p></o:p></p>
</div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
Reid Barton<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
On Wed, Aug 5, 2015 at 12:09 PM, Thomas Miedema <<a href="mailto:thomasmiedema@gmail.com" target="_blank">thomasmiedema@gmail.com</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
Try running 'arc update' anytime you get such kind of error.<o:p></o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
Austin upgrades GHC's Phabricator instance every now and then. Sometimes this requires also an update to `arc` for things to work again.<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
<div>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
On Wed, Aug 5, 2015 at 6:02 PM, Simon Peyton Jones <<a href="mailto:simonpj@microsoft.com" target="_blank">simonpj@microsoft.com</a>> wrote:<o:p></o:p></p>
</div>
</div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<div>
<div>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">Friends<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">I wanted to build a Phab ticket, so I tried<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"> arc patch D1069<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">but it failed, as below. What do I do now?<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">Thanks<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">Simon<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
simonpj@cam-05-unx:~/code/HEAD-5$ arc patch D1069<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
You have untracked files in this working copy.<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Working copy: /home/simonpj/code/HEAD-5/<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Untracked files in working copy:<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Foo<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
compiler/basicTypes/T7287.stderr<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
foo<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
libraries/integer-gmp2/GNUmakefile<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
libraries/integer-gmp2/<a href="http://ghc.mk" target="_blank">ghc.mk</a><o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
spj-patch<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T2604.hs<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T2604.stderr<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T5863a.hs<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T5863a.stderr<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T7800.hs<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/deriving/should_fail/T7800.stderr<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
testsuite/tests/typecheck/should_compile/T9999.hs<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
typeable-msg<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Since you don't have '.gitignore' rules for these files and have not listed<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
them in '.git/info/exclude', you may have forgotten to 'git add' them to your<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
commit.<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Do you want to add these files to the commit? [y/N] N<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
N<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Created and checked out branch arcpatch-D1069.<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
Exception<o:p></o:p></p>
<p style="mso-margin-top-alt:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:36.0pt;margin-bottom:.0001pt">
ERR-CONDUIT-CALL: API Method "differential.query" does not define these parameters: 'arcanistProjects'.<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">(Run with --trace for a full exception trace.)<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt">_______________________________________________<br>
ghc-devs mailing list<br>
<a href="mailto:ghc-devs@haskell.org" target="_blank">ghc-devs@haskell.org</a><br>
<a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" target="_blank">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><o:p></o:p></p>
</blockquote>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
_______________________________________________<br>
ghc-devs mailing list<br>
<a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a><br>
<a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" target="_blank">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><o:p></o:p></p>
</blockquote>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</body>
</html>