Patch 1077: resolve issue1828: file listing and work... (and 1 more) - Darcs bug tracker

Title	resolve issue1828: file listing and work... (and 1 more)
Superseder		Nosy List	gh
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2013-07-04.13:42:04 by gh, last changed 2013-07-16.09:42:11 by gh.

Files
File name	Status	Uploaded	Type	Edit	Remove
patch-preview.txt		gh, 2013-07-04.13:42:03	text/x-darcs-patch
resolve-issue1828_-file-listing-and-working-__dry_run-for-mark_conflicts.dpatch		gh, 2013-07-04.13:42:04	application/x-darcs-patch
unnamed		gh, 2013-07-04.13:42:04

See mailing list archives for discussion on individual patches.

Messages
msg16890 (view)	Author: gh	Date: 2013-07-04.13:42:04
This makes `darcs mark-conflicts` list files that contain conflicts. In the same patch I introduced the use of --dry-run for this command. This enables to list conflicting files without being prompted if one want to modify them. A future piece of work that can be done on that would be to give more details about the conflicts. By using Darcs.Patch.plainSummaryPrims, we can show the kind of primitive patches that are involved in conflicts (hunk, add, move...), but the output for hunks should be replaced by the number of "conflicting zones" in each file. 2 patches for repository http://darcs.net: Thu Jul 4 15:06:54 CEST 2013 Guillaume Hoffmann <guillaumh@gmail.com> * resolve issue1828: file listing and working --dry-run for mark-conflicts Thu Jul 4 15:36:29 CEST 2013 Guillaume Hoffmann <guillaumh@gmail.com> * update help of mark-conflicts Attachments patch-preview.txt resolve-issue1828_-file-listing-and-working-__dry_run-for-mark_conflicts.dpatch unnamed
msg16898 (view)	Author: gh	Date: 2013-07-16.09:42:11
Self-accepting with owst's approval on IRC.

History
Date	User	Action	Args
2013-07-04 13:42:04	gh	create
2013-07-04 14:27:59	gh	set	status: needs-screening -> needs-review
2013-07-16 09:42:11	gh	set	status: needs-review -> accepted messages: + msg16898