On Fri, Jul 29, 2005 at 06:34:03AM -0400, David Roundy wrote: > With a 'pull' we would have announced the conflict. The trouble is that > with a get, checking for conflicts could be very expensive (depending how > far back in the history we went--in theory we'd have to go all the way back > to the second patch, which would cost us O(N^2) or worse in the total > number of patches (depending how unlucky we are).
Seems like that could be avoided with a simple flag in the inventory marking patches as containing unresolved conflicts. Darcs must've been aware of the conflict when it first appeared. > The conflict should have been announced when it was created, and should > have been marked, unless the --allow-conflicts flag was used. Yes, but that doesn't help if you're getting from someone else's repo, and the markers are sitting in their working copy. Clearly this can be avoided using suitable working practices, but as we've seen, it's easy for inexperienced users to trip up on these things, since they aren't set in stone. -- Jamie Webb _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
