Issue 2115: darcs pull interactively should warn of conflicts - Darcs bug tracker

Title	darcs pull interactively should warn of conflicts
Priority	feature	Status	needs-diagnosis/design
Milestone		Resolved in
Superseder		Nosy List	andreas.abel
Assigned To		Topics	Conflicts, UI

Created on 2011-12-20.12:00:36 by andreas.abel, last changed 2013-02-17.13:53:14 by kowey.

Messages
msg14837 (view)	Author: andreas.abel	Date: 2011-12-20.12:00:35
Hi darcs team, when I run darcs pull, I am being asked about which patches I want to apply. Can darcs warn me about conflicts while it is asking for my decision? I could make a more informed decision then (since I hate conflicts). This is basically a request for changing darcs such that it will output a line informing me about the conflicts I will buy when I pull the patch. Cheers, Andreas -- Andreas Abel <>< Du bist der geliebte Mensch. Theoretical Computer Science, University of Munich Oettingenstr. 67, D-80538 Munich, GERMANY andreas.abel@ifi.lmu.de http://www2.tcs.ifi.lmu.de/~abel/
msg16687 (view)	Author: kowey	Date: 2013-02-17.13:53:11
More improvements to conflicts UI would be great. We have a list of things we'd like to see, although mostly in the area of trying to figure out what conflicted with which. Note that there are options like -- skip-conflicts… not quite what you're looking for but sort of an approximation. I'm of course totally glossing over feasibility with current darcs when I say this would be good

History
Date	User	Action	Args
2011-12-20 12:00:37	andreas.abel	create
2013-02-17 13:53:14	kowey	set	priority: feature status: unknown -> needs-diagnosis/design topic: + Conflicts, UI messages: + msg16687 title: Feature request: darcs pull interactively should warn of conflicts -> darcs pull interactively should warn of conflicts