[Monotone-devel] Updated Issue 103 - Enhancement request: Generate filename automatically for 'mtn conflicts resolve_first interactive' (monotone)

[code]

Hello,

The following issue has been updated:

103 - Enhancement request: Generate filename automatically for 'mtn conflicts 
resolve_first interactive'
Project: monotone
Status: Accepted
Reported by: joe 23
URL: http://code.monotone.ca/p/monotone/issues/103/
Labels:
 Type:Defect
 Priority:Medium

Comments (last first):

# By Stephen Leake, Nov  8, 2010:

No need to "peek into _MTN/conflicts"; use 'mtn conflicts show_first'. See 
http://www.monotone.ca/docs/Conflicts.html#Conflicts for more. You must know 
what conflict you are resolving before specifying the resolution; 'interactive' 
is only appropriate for file content conflicts (which are the majority of 
conflicts, but not the only possible ones).

At the same time, it is possible to generate a good filename automatically, 
since 'interactive' is only appropriate for single-file conflicts, which have a 
well-defined name. The Emacs DVC front-end does exactly that. I'll work on it.

 Status: Accepted
 Owner: stephe

# By joe 23, Nov  8, 2010:

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

1. mtn conflicts store
2. mtn conflicts resolve_first interactive


Expected result:
----------------
Generate a filename in _MTN automatically to store the resolution. Either a 
random name, or even better, intelligently pick a name. For example, if the 
merge is for path/to/foo.c, make the filename be _MTN/foo.c.

It is awkward to have to specify a file name on the command line when you don't 
know what conflict you will be resolving with resolve_first, unless you peek in 
_MTN/conflicts first.

Actual results:
---------------
mtn: misuse: wrong number of arguments


Output of `mtn version --full`:
-------------------------------
monotone 0.99.1 (base revision: 8973482283db7c36780dce2b54721ccc0f5b7388)
Running on          : Linux 2.6.32-25-generic #45-Ubuntu SMP Sat Oct 16 
19:48:22 UTC 2010 i686
C++ compiler        : GNU C++ version 4.3.2
C++ standard library: GNU libstdc++ version 20080905
Boost version       : 1_40
SQLite version      : 3.5.9 (compiled against 3.5.9)
Lua version         : Lua 5.1
PCRE version        : 7.6 2008-01-28 (compiled against 7.6)
Botan version       : 1.8.9 (compiled against 1.8.9)
Changes since base revision:
format_version "1"

new_manifest [c1270158b7fa91abf8235ad129b0476943bde1ed]

old_revision [8973482283db7c36780dce2b54721ccc0f5b7388]

  Generated from data cached in the distribution;
  further changes may have been made.



--
Issue: http://code.monotone.ca/p/monotone/issues/103/