On Sun, May 02, 2010 at 11:10:41 +0000, Petr Ročkai wrote: > - applySome xs = do tentativelyMergePatches repository "convert" > (AllowConflicts:opts) NilFL xs > + applySome xs = do Sealed pw <- tentativelyMergePatches repository > "convert" (AllowConflicts:opts) NilFL xs > finalizeRepositoryChanges repository -- this is > to clean out pristine.hashed > revertRepositoryChanges repository > hunk ./src/Darcs/Commands/Convert.lhs 217 > + revertable $ applyToWorking repository opts pw > + invalidateIndex repository
Petr has blessed my reading of this patch on IRC, so I'm pushing it in
just to get as much Darcs 2.4.2 work out of the way as soon as possible.
Eric: is it OK for me to push the issue1760 (convert regression) patch?
I just saw that it applies to working on the fly (which if I understand
correctly, avoids conflicts building up in working)
and invalidates the index (which seems to make sense as a consequence
of applying to working)
Petr: That's the gist. In the end, however, it would still
be better to use Ganesh's tentativelyAddPatch approach instead of the
current one. Possibly for 2.5.
--
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
