On Mon, 2006-01-16 at 13:34 +1100, Daniel Carosone wrote: > On Sun, Jan 15, 2006 at 09:21:27PM -0500, Yury Polyanskiy wrote: > > The other way is to hack SP and make it call regular monotone commands. > > In this latter case, of course it'd be nice if the tool worked with > > standard monotone releases, not some specially patched ones. So I'm > > just looking for a way to do this. > > Ahah, now here's a very straightforward and concrete requirement that > will help guide the interface design for the feature we already knew > we'd probably want for something. Programs like tailor are likely to > want very similar features. > > For now, i'd suggest you use the hooks-style approach to supply the > merge with the correct file content from the equivalent BK rev.
Note that if monotone can merge a file without conflicts, then it doesn't call the merge hook on that file at all. Tim _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
