Patch 1046: less confusing apply --skip-conflicts message when eve... - Darcs bug tracker

Title	less confusing apply --skip-conflicts message when eve...
Superseder		Nosy List	gh
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2013-02-17.16:12:02 by gh, last changed 2013-04-25.19:35:56 by gh.

Files
File name	Status	Uploaded	Type	Edit	Remove
less-confusing-apply-__skip_conflicts-message-when-everything-conflicts.dpatch		gh, 2013-02-17.16:12:01	application/x-darcs-patch
patch-preview.txt		gh, 2013-02-17.16:12:01	text/x-darcs-patch
unnamed		gh, 2013-02-17.16:12:01

See mailing list archives for discussion on individual patches.

Messages
msg16689 (view)	Author: gh	Date: 2013-02-17.16:12:01
This just happened to me: darcs apply --skip-conflicts -i bundle.dpatch Skipping some patches which would cause conflicts. All these patches have already been applied. Nothing to do. But in fact every patch of the bundle conflicted with my repo. So now the message should be: Skipping some patches which would cause conflicts. All new patches of the bundle cause conflicts. Nothing to do. 1 patch for repository http://darcs.net: Sun Feb 17 17:07:21 CET 2013 Guillaume Hoffmann <guillaumh@gmail.com> * less confusing apply --skip-conflicts message when everything conflicts Attachments less-confusing-apply-__skip_conflicts-message-when-everything-conflicts.dpatch patch-preview.txt unnamed
msg16775 (view)	Author: gh	Date: 2013-04-25.19:35:56
Doesn't interfere with testsuite. Self accepting.

History
Date	User	Action	Args
2013-02-17 16:12:02	gh	create
2013-02-17 16:12:19	gh	set	status: needs-screening -> needs-review
2013-04-25 19:35:56	gh	set	status: needs-review -> accepted messages: + msg16775