[darcs-devel] [issue275] Unrecording fails
simonpj
bugs at darcs.net
Fri Sep 29 08:19:35 PDT 2006
New submission from simonpj <simonpj at microsoft.com>:
Dear Darcsers,
It's not my day.
I recorded patch, but by mistake gave it the silly name "f". So I tried
to un-record it. Transcript is below. But the net effect is that darcs
fell over (in "get_extra", whatever that is) in the middle of what
should be an utterly straightforward operation. I did nothing
whatsoever between record and unrecord.
Simon
sh-2.04$ darcs record
hunk ./compiler/basicTypes/BasicTypes.lhs 112
-data IPName name
- = Dupable name -- ?x: you can freely duplicate this implicit
parameter
- | Linear name -- %x: you must use the splitting
function to duplicate it
+newtype IPName name = IPName name -- ?x
Shall I record this change? (1/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/coreSyn/CoreLint.lhs 32
- splitFunTy_maybe, mkTyVarTys,
+ splitFunTy_maybe, [_$_]
Shall I record this change? (6/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/coreSyn/CoreSubst.lhs 27
-import CoreSyn ( Expr(..), Bind(..), Note(..), CoreExpr,
CoreBind,
+import CoreSyn ( Expr(..), Bind(..), CoreExpr, CoreBind,
Shall I record this change? (9/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/coreSyn/CoreSyn.lhs 53
-import TyCon ( isNewTyCon )
Shall I record this change? (11/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/hsSyn/HsExpr.lhs 21
-import Type ( Type, pprParendType )
-import Var ( TyVar, Id )
+import Var ( Id )
Shall I record this change? (13/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/iface/BinIface.hs 21
-import Type ( Kind,
- isLiftedTypeKind, isUnliftedTypeKind,
isOpenTypeKind,
- isArgTypeKind, isUbxTupleKind, liftedTypeKind,
- unliftedTypeKind, openTypeKind, argTypeKind,
[_$_]
- ubxTupleKind, mkArrowKind, splitFunTy_maybe )
Shall I record this change? (14/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/iface/BuildTyCl.lhs 18
-import DataCon ( DataCon, isNullarySrcDataCon,
dataConUnivTyVars,
- mkDataCon, dataConFieldLabels,
dataConInstOrigArgTys,
- dataConTyCon )
+import DataCon ( DataCon, isNullarySrcDataCon, [_$_]
+ mkDataCon, dataConFieldLabels,
dataConInstOrigArgTys )
Shall I record this change? (16/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/iface/IfaceEnv.lhs 25
-import Type ( mkOpenTvSubst, substTy )
Shall I record this change? (21/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/iface/IfaceSyn.lhs 39
-import TcType ( deNoteType )
Shall I record this change? (24/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/iface/IfaceType.lhs 29
-import Type ( Kind )
-import Coercion ( Coercion )
Shall I record this change? (28/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/parser/Lexer.x 253
- \% @varid / { ifExtension ipEnabled } { skip_one_varid ITsplitipvarid
}
Shall I record this change? (30/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/parser/Parser.y.pp 258
- IPSPLITVARID { L _ (ITsplitipvarid _) } -- GHC
extension
Shall I record this change? (32/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/prelude/PrelInfo.lhs 31
-import MkId ( mkPrimOpId, wiredInIds )
Shall I record this change? (35/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/prelude/PrelNames.lhs 195
- -- Splittable class
- splittableClassName, splitName,
-
Shall I record this change? (36/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/Inst.lhs 31
- isLinearInst, linearInstType, isIPDict, isInheritableInst,
+ isIPDict, isInheritableInst,
Shall I record this change? (40/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/TcExpr.lhs 48
- isSigmaTy, mkFunTy, mkTyConApp, isLinearPred,
+ isSigmaTy, mkFunTy, mkTyConApp, [_$_]
Shall I record this change? (43/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/TcHsSyn.lhs 1
-%
+ %
Shall I record this change? (47/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/TcRnTypes.lhs 53
-import TcType ( TcTyVarSet, TcType, TcThetaType, SkolemInfo,
TvSubst,
+import TcType ( TcTyVarSet, TcType, TcThetaType, SkolemInfo,
[_$_]
Shall I record this change? (49/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/TcSimplify.lhs 25
- HsWrapper(..), (<.>), nlHsTyApp, emptyLHsBinds
)
-import TcHsSyn ( mkHsApp )
+ HsWrapper(..), (<.>), emptyLHsBinds )
Shall I record this change? (52/?) [ynWsfqadjkc], or ? for help: f
hunk ./compiler/typecheck/TcType.lhs 71
- mkClassPred, isInheritablePred, isLinearPred, isIPPred, mkPredName,
[_$_]
+ mkClassPred, isInheritablePred, isIPPred, mkPredName, [_$_]
Shall I record this change? (73/?) [ynWsfqadjkc], or ? for help: f
What is the patch name? f
Do you want to add a long comment? [yn]y
Finished recording patch 'f'
sh-2.04$ darcs unrecord -p 'f'
Fri Sep 29 16:14:15 GMT Daylight Time 2006 simonpj at microsoft.com
* f
Shall I unrecord this patch? (1/?) [ynWvpxqadjkc], or ? for help: y
Fri Sep 29 15:39:10 GMT Daylight Time 2006 simonpj at microsoft.com
* Global renamings in HsSyn
Shall I unrecord this patch? (2/?) [ynWvpxqadjkc], or ? for help: n
Fri Sep 29 14:35:49 GMT Daylight Time 2006 simonpj at microsoft.com
* Improve pretty-printing of Core
Shall I unrecord this patch? (3/?) [ynWvpxqadjkc], or ? for help: ?
How to use unrecord...
y: unrecord this patch
n: don't unrecord it
w: wait and decide later, defaulting to no
v: view this patch in full
p: view this patch in full with pager
x: view a summary of this patch
d: unrecord selected patches, skipping all the remaining patches
a: unrecord all the remaining patches
q: cancel unrecord
j: skip to next patch
k: back up to previous patch
c: calculate number of patches
h or ?: show this help
<Space>: accept the current default (which is capitalized)
Fri Sep 29 14:35:49 GMT Daylight Time 2006 simonpj at microsoft.com
* Improve pretty-printing of Core
Shall I unrecord this patch? (3/?) [ynWvpxqadjkc], or ? for help: d
darcs.exe: failed to read patch in get_extra:
Fri Apr 7 11:18:39 GMT Daylight Time 2006 Simon Marlow
<simonmar at microsoft.com>
* Fix a bug related to threads blocked on blackholes
We weren't making them live early enough, with the result that
finalizable objects referred to only by a thread blocked on a black
hole could be finalized too early (see conc057 test).
Perhaps this is a 'partial' repository?
sh-2.04$
----------
messages: 1012
nosy: EricKow, droundy, simonpj, tommy
status: unread
title: Unrecording fails
____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue275>
____________________________________
More information about the darcs-devel
mailing list