[Monotone-devel] Updated Issue 108 - Enhancement: Output conflict summary for 'mtn conflicts store' (monotone)

[code]

Hello,

The following issue has been updated:

108 - Enhancement: Output conflict summary for 'mtn conflicts store'
Project: monotone
Status: Fixed
Reported by: joe 23
URL: https://code.monotone.ca/p/monotone/issues/108/
Labels:
 Type:Defect
 Priority:Medium

Comments (last first):

# By joe 23, Nov 20, 2010:

Wow, I had no idea about 'mtn show_conflicts', because it isn't listed in 'mtn 
help conflicts' - it's in the 'informative' help group. 'mtn conflicts 
show_all' as an alias might be very useful for helping clueless people like me 
find it. Or adding show_conflicts in the 'tree' help group. Or both.

Thanks alot!

# By Stephen Leake, Nov 20, 2010:

'mtn show_conflicts' outputs the list of conflicts without storing them. 
Perhaps that should be renamed to 'mtn conflicts show_all'

It is reasonable to have 'mtn conflicts store' output a summary.

Fixed in c26b91d1884512efa7adf1b209f207d142c03606

 Status: Fixed

# By joe 23, Nov 19, 2010:

'mtn conflicts store' generates no messages at all, leaving the user to wonder, 
and to type additional commands to find out what happened.


If mtn had this, then 'mtn conflicts store --conflicts-file /dev/null' would be 
close to an implementation of 'mtn merge|prop|explict_merge --dry-run', which 
is another feature that would definitely be appreciated.


Steps to reproduce the problem:
-------------------------------

1. mtn conflicts store

Expected result:
----------------
Some possibilities:

3 conflicts found
or
5 conflicts stored in _MTN/conflicts
or
1 single-file and 3 two-file conflicts found
or
No conflicts
or
list of conflicts

Actual results:
---------------
(no output at all)


Output of `mtn version --full`:
-------------------------------
0.99.1



--
Issue: https://code.monotone.ca/p/monotone/issues/108/