Issue 2114: behavior of darcs pull --allow-conflicts is not documented - Darcs bug tracker

Title	behavior of darcs pull --allow-conflicts is not documented
Priority	bug	Status	unknown
Milestone		Resolved in
Superseder		Nosy List	markstos
Assigned To		Topics

Created on 2011-12-16.15:41:28 by markstos, last changed 2024-06-21.23:01:15 by markstos.

Messages
msg14832 (view)	Author: markstos	Date: 2011-12-16.15:41:27
The --allow-conflicts option for pull is mentioned in the manual, but the behavior is not documented. It seems to be it could mean multiple things: 1. It's the same as pulling, getting conflict markers and then during a "revert -a". 2. It always resolves to one side of the conflict, but leaves it as "whatsnew" 3. It always resolves to the other side of the conflict, but leaves the changes as "whatsnew". 4. It is exactly like the behavior with conflict markers, except the markers are present. (Both sides of the conflicts might be present and unrecorded, but with no markers). A simple sentence to or two to clarify the behavior would be helpful.
msg14833 (view)	Author: markstos	Date: 2011-12-16.15:48:21
From a test, it appears the behavior is the same as pulling with conflict markers, and then doing a revert -a. I believe this means that conflicts are resolved in the favor of the changes being pulled in.
msg24037 (view)	Author: bfrk	Date: 2024-06-21.22:45:57
Resolved ages ago, see `darcs help apply`.
msg24041 (view)	Author: markstos	Date: 2024-06-21.23:01:15
Thanks!

History
Date	User	Action	Args
2011-12-16 15:41:28	markstos	create
2011-12-16 15:48:22	markstos	set	messages: + msg14833
2024-06-21 22:45:57	bfrk	set	messages: + msg24037
2024-06-21 22:46:06	bfrk	set	status: unknown -> resolved
2024-06-21 23:01:15	markstos	set	status: resolved -> unknown messages: + msg24041