On Tue, Feb 02, 2010 at 14:15:52 +0000, Florent Becker wrote: > Tue Jan 5 16:02:15 CET 2010 Florent Becker <[email protected]> > * resolve issue 1719
Applied, thanks. I think a little description would have helped me understand this (easy) patch a bit quicker resolve issue1719: back up working dir less aggressively If --dont-allow-conflicts or --allow-conflicts are used, there is no need to back up the working directory Also, one thing to check below... resolve issue 1719 ------------------ > - mapM_ backupByCopying $ listTouchedFiles standard_resolved_pw > + unless (AllowConflicts `elem` opts || NoAllowConflicts `elem` opts) $ > + mapM_ backupByCopying $ listTouchedFiles standard_resolved_pw What happens if the user passes in --allow-conflicts --mark-conflicts? Sigh, I do hope we can switch to Neil's cmdargs or something like it http://bugs.darcs.net/issue1550 -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
pgprEtdCvaEgZ.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
