Hi, I rebased D1069 on master from this morning. arc patch D1069 works for me. It seems there were some strange interactions with it depending on another patch that has already been merged.
You might need to run `git submodule sync` and `git submodule update` after patching to update the haddock submodule. --Adam On Wed, 5 Aug 2015, at 06:21 PM, Simon Peyton Jones wrote: > Thanks that worked. Now it fails in a new way! “Cherry pick failed”. > > What now? > > Simon > > simonpj@cam-05-unx:~/code/HEAD-5$ arc patch D1069 > arc patch D1069 > You have untracked files in this working copy. > > Working copy: /home/simonpj/code/HEAD-5/ > > Untracked changes in working copy: > (To ignore these changes, add them to ".git/info/exclude".) > D1069-patch > Foo > compiler/basicTypes/T7287.stderr > foo > libraries/integer-gmp2/GNUmakefile > libraries/integer-gmp2/ghc.mk > spj-patch > testsuite/tests/deriving/should_fail/T2604.hs > testsuite/tests/deriving/should_fail/T2604.stderr > testsuite/tests/deriving/should_fail/T5863a.hs > testsuite/tests/deriving/should_fail/T5863a.stderr > testsuite/tests/deriving/should_fail/T7800.hs > testsuite/tests/deriving/should_fail/T7800.stderr > testsuite/tests/typecheck/should_compile/T9999.hs > typeable-msg > > Ignore these untracked files and continue? [y/N] y > y > > Branch name arcpatch-D1069 already exists; trying a new name. > Branch name arcpatch-D1069_1 already exists; trying a new name. > Created and checked out branch arcpatch-D1069_2. > Created and checked out branch arcpatch-D1033. > Checking patch utils/haddock... > Checking patch testsuite/tests/driver/T4437.hs... > Checking patch testsuite/tests/deSugar/should_run/all.T... > Checking patch > testsuite/tests/deSugar/should_run/DsStrictData.stdout... > Checking patch testsuite/tests/deSugar/should_run/DsStrictData.hs... > Checking patch docs/users_guide/glasgow_exts.xml... > Checking patch docs/users_guide/flags.xml... > Checking patch compiler/vectorise/Vectorise/Generic/PData.hs... > Checking patch compiler/typecheck/TcTyClsDecls.hs... > Checking patch compiler/typecheck/TcSplice.hs... > Checking patch compiler/typecheck/TcRnDriver.hs... > Checking patch compiler/typecheck/TcExpr.hs... > Checking patch compiler/prelude/TysWiredIn.hs... > Checking patch compiler/parser/RdrHsSyn.hs... > Checking patch compiler/parser/Parser.y... > Checking patch compiler/main/DynFlags.hs... > Checking patch compiler/iface/TcIface.hs... > Checking patch compiler/iface/MkIface.hs... > Checking patch compiler/iface/BuildTyCl.hs... > Checking patch compiler/hsSyn/HsTypes.hs... > Checking patch compiler/hsSyn/Convert.hs... > Checking patch compiler/deSugar/DsMeta.hs... > Checking patch compiler/basicTypes/MkId.hs... > Checking patch compiler/basicTypes/DataCon.hs... > warning: unable to rmdir utils/haddock: Directory not empty > Applied patch utils/haddock cleanly. > Applied patch testsuite/tests/driver/T4437.hs cleanly. > Applied patch testsuite/tests/deSugar/should_run/all.T cleanly. > Applied patch testsuite/tests/deSugar/should_run/DsStrictData.stdout > cleanly. > Applied patch testsuite/tests/deSugar/should_run/DsStrictData.hs > cleanly. > Applied patch docs/users_guide/glasgow_exts.xml cleanly. > Applied patch docs/users_guide/flags.xml cleanly. > Applied patch compiler/vectorise/Vectorise/Generic/PData.hs cleanly. > Applied patch compiler/typecheck/TcTyClsDecls.hs cleanly. > Applied patch compiler/typecheck/TcSplice.hs cleanly. > Applied patch compiler/typecheck/TcRnDriver.hs cleanly. > Applied patch compiler/typecheck/TcExpr.hs cleanly. > Applied patch compiler/prelude/TysWiredIn.hs cleanly. > Applied patch compiler/parser/RdrHsSyn.hs cleanly. > Applied patch compiler/parser/Parser.y cleanly. > Applied patch compiler/main/DynFlags.hs cleanly. > Applied patch compiler/iface/TcIface.hs cleanly. > Applied patch compiler/iface/MkIface.hs cleanly. > Applied patch compiler/iface/BuildTyCl.hs cleanly. > Applied patch compiler/hsSyn/HsTypes.hs cleanly. > Applied patch compiler/hsSyn/Convert.hs cleanly. > Applied patch compiler/deSugar/DsMeta.hs cleanly. > Applied patch compiler/basicTypes/MkId.hs cleanly. > Applied patch compiler/basicTypes/DataCon.hs cleanly. > Submodule 'libffi-tarballs' () registered for path 'libffi-tarballs' > Submodule 'libraries/Cabal' () registered for path 'libraries/Cabal' > Submodule 'libraries/Win32' () registered for path 'libraries/Win32' > Submodule 'libraries/array' () registered for path 'libraries/array' > Submodule 'libraries/binary' () registered for path 'libraries/binary' > Submodule 'libraries/bytestring' () registered for path > 'libraries/bytestring' > Submodule 'libraries/containers' () registered for path > 'libraries/containers' > Submodule 'libraries/deepseq' () registered for path > 'libraries/deepseq' > Submodule 'libraries/directory' () registered for path > 'libraries/directory' > Submodule 'libraries/dph' () registered for path 'libraries/dph' > Submodule 'libraries/filepath' () registered for path > 'libraries/filepath' > Submodule 'libraries/haskeline' () registered for path > 'libraries/haskeline' > Submodule 'libraries/hoopl' () registered for path 'libraries/hoopl' > Submodule 'libraries/hpc' () registered for path 'libraries/hpc' > Submodule 'libraries/parallel' () registered for path > 'libraries/parallel' > Submodule 'libraries/pretty' () registered for path 'libraries/pretty' > Submodule 'libraries/primitive' () registered for path > 'libraries/primitive' > Submodule 'libraries/process' () registered for path > 'libraries/process' > Submodule 'libraries/random' () registered for path 'libraries/random' > Submodule 'libraries/stm' () registered for path 'libraries/stm' > Submodule 'libraries/terminfo' () registered for path > 'libraries/terminfo' > Submodule 'libraries/time' () registered for path 'libraries/time' > Submodule 'libraries/transformers' () registered for path > 'libraries/transformers' > Submodule 'libraries/unix' () registered for path 'libraries/unix' > Submodule 'libraries/vector' () registered for path 'libraries/vector' > Submodule 'libraries/xhtml' () registered for path 'libraries/xhtml' > Submodule 'nofib' () registered for path 'nofib' > Submodule 'utils/haddock' () registered for path 'utils/haddock' > Submodule 'utils/hsc2hs' () registered for path 'utils/hsc2hs' > Submodule path 'libraries/array': checked out > '604afd531aba4a96b066f6e59a08813107a9eed3' > Submodule path 'libraries/parallel': checked out > 'e4e4228ba94178cf31b97fe81b94bff3de6fce03' > Submodule path 'utils/haddock': checked out > '5eb0785cde60997f072c3bdfefaf8c389c96d42e' > > Cherry Pick Failed! > Exception > Command failed with error #1! > COMMAND > git cherry-pick 'arcpatch-D1033' > > STDOUT > # On branch arcpatch-D1069_2 > # Changes not staged for commit: > #(use "git add <file>..." to update what will be committed) > #(use "git checkout -- <file>..." to discard changes in working > #directory) > # > #modified: libraries/array (new commits) > #modified: libraries/parallel (new commits) > #modified: utils/haddock (new commits) > # > # Untracked files: > #(use "git add <file>..." to include in what will be committed) > # > #D1069-patch > #Foo > #compiler/basicTypes/T7287.stderr > #foo > #libraries/integer-gmp2/ > #spj-patch > #testsuite/tests/deriving/should_fail/T2604.hs > #testsuite/tests/deriving/should_fail/T2604.stderr > #testsuite/tests/deriving/should_fail/T5863a.hs > #testsuite/tests/deriving/should_fail/T5863a.stderr > #testsuite/tests/deriving/should_fail/T7800.hs > #testsuite/tests/deriving/should_fail/T7800.stderr > #testsuite/tests/typecheck/should_compile/T9999.hs > #typeable-msg > no changes added to commit (use "git add" and/or "git commit -a") > > > STDERR > The previous cherry-pick is now empty, possibly due to conflict > resolution. > If you wish to commit it anyway, use: > > git commit --allow-empty > > Otherwise, please use 'git reset' > > (Run with `--trace` for a full exception trace.) > 49simonpj@cam-05-unx:~/code/HEAD-5$ > > *From:* Reid Barton [mailto:rwbar...@gmail.com] > > *Sent:* 05 August 2015 17:13 *To:* Thomas Miedema *Cc:* Simon Peyton > Jones; ghc-devs *Subject:* Re: arc patch > > It's actually "arc upgrade". I added a mention of this command to the > wiki: > https://ghc.haskell.org/trac/ghc/wiki/Phabricator#HelpImgettingastrangeerrorwhenrunningarcthatIdidntgetyesterday > Regards, > Reid Barton > > On Wed, Aug 5, 2015 at 12:09 PM, Thomas Miedema > <thomasmied...@gmail.com> wrote: >> Try running 'arc update' anytime you get such kind of error. >> >> Austin upgrades GHC's Phabricator instance every now and then. >> Sometimes this requires also an update to `arc` for things to >> work again. >> >> On Wed, Aug 5, 2015 at 6:02 PM, Simon Peyton Jones >> <simo...@microsoft.com> wrote: >>> Friends >>> I wanted to build a Phab ticket, so I tried >>> arc patch D1069 >>> but it failed, as below. What do I do now? >>> Thanks >>> Simon >>> simonpj@cam-05-unx:~/code/HEAD-5$ arc patch D1069 >>> You have untracked files in this working copy. >>> >>> Working copy: /home/simonpj/code/HEAD-5/ >>> >>> Untracked files in working copy: >>> Foo >>> compiler/basicTypes/T7287.stderr >>> foo >>> libraries/integer-gmp2/GNUmakefile >>> libraries/integer-gmp2/ghc.mk >>> spj-patch >>> testsuite/tests/deriving/should_fail/T2604.hs >>> testsuite/tests/deriving/should_fail/T2604.stderr >>> testsuite/tests/deriving/should_fail/T5863a.hs >>> testsuite/tests/deriving/should_fail/T5863a.stderr >>> testsuite/tests/deriving/should_fail/T7800.hs >>> testsuite/tests/deriving/should_fail/T7800.stderr >>> testsuite/tests/typecheck/should_compile/T9999.hs >>> typeable-msg >>> >>> Since you don't have '.gitignore' rules for these files and have not >>> listed >>> them in '.git/info/exclude', you may have forgotten to 'git add' >>> them to your >>> commit. >>> >>> >>> Do you want to add these files to the commit? [y/N] N >>> N >>> >>> Created and checked out branch arcpatch-D1069. >>> Exception >>> ERR-CONDUIT-CALL: API Method "differential.query" does not define >>> these parameters: 'arcanistProjects'. >>> (Run with --trace for a full exception trace.) >>> >>> _______________________________________________ >>> ghc-devs mailing list >>> ghc-devs@haskell.org >>> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs >> >> >> _______________________________________________ >> ghc-devs mailing list >> ghc-devs@haskell.org >> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > > _________________________________________________ > ghc-devs mailing list ghc-devs@haskell.org > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
