Issue 2330 more precise conflicts reporting

Title more precise conflicts reporting
Priority feature Status unknown
Milestone Resolved in
Superseder Nosy List gh
Assigned To
Topics Conflicts, UI

Created on 2013-07-05.09:42:29 by gh, last changed 2013-07-05.09:42:29 by gh.

msg16892 (view) Author: gh Date: 2013-07-05.09:42:26
The commands involved are mark-conflict, pull, and apply.

When conflicts are reported, we just see a list of files where conflicts
occur. We could have more information to see how bad the situation is:

1) how many hunks are conflicting in each files
2) the kind of conflicts: add, move, delete, replace, etc.

The function Darcs.Patch.Summary plainSummaryPrims already gives us 2).
For 1), it gives the number of lines involved in the conflict markers.
Date User Action Args
2013-07-05 09:42:29ghcreate