Le 05/12/2010 23:44, Ganesh Sittampalam a écrit : > On Sun, 5 Dec 2010, Guillaume Hoffmann wrote: > >> 2010/12/4 Eric Kow <b...@darcs.net>: >>> >>> New submission from Eric Kow <ko...@darcs.net>: >>> >>> To make conflicts easier to deal with, one option might be for darcs >>> pull and apply to gittishly refuse to work until you record first. >>> >>> We could introduce a flag to allow the old behaviour of allowing dirty >>> working directory. >>> >>> Needs discussion probably > > Since it's only a problem when there are conflicts, and darcs knows when > there are, we could restrict the refusal to those situations. Either if > there are any conflicts, or preferably if there are any conflicts with > unrecorded changes.
How about: These changes conflict with your unrecorded changes, do you want to record them as "UNRECORDED DRAFT" before proceeding? (yn…) Florent _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users
