Message5697

Author richlowe
Recipients brendan, carlsonj, mpm, pmezard
Date 2008-03-23.03:16:30
Content
pmezard:
  Won't that lose the automatic aspect of imerge merge -a (it'll just run what
you have 
  configured, which may be interactive)

I think using the builtin simplemerge instead of calling merge(1) would work
(but haven't tried).  It's somewhat tempting to suggest that the new merge
framework gaining a .interactive property, and imerge using those tools where
.interactive == False in priority order (as appropriate) would probably be the
right thing (presuming here that simplemerge would be the default case there,
where nothing else was configured).
History
Date User Action Args
2008-03-23 03:16:31richlowesetmessageid: <1206242191.32.0.319398156717.issue1045@selenic.com>
2008-03-23 03:16:31richlowesetrecipients: + mpm, brendan, pmezard, carlsonj
2008-03-23 03:16:31richlowelinkissue1045 messages
2008-03-23 03:16:30richlowecreate