Re: Monotone VCS support

[dieter <cdklarmann gmx de>]

Daniel Thompson <daniel <at> redfelineninja.org.uk> writes:
> 
> On Sun, 2005-11-20 at 12:33:19 +0000 (UTC), Stephen Kennedy wrote:
> > > Please find attached two patches. The first adds support for the
> > > monotone revision control system which I have spent the last few
> > days
> > > using myself as test. The second contains nothing techincal, it is
> > > simply a 'vanity' patch. Specifically it adds my name to AUTHORS and
> > > copies the whole of the contributors section into the Written by:
> > tab in
> > > the about dialog.
> > 
> > Thanks Daniel, I've added the monotone vc plugin. I had to modifiy
> > it because it contained a mixure of tabs/spaces. Can you verify
> > that I didn't break it? In particular, there was a tab character
> > in PATCH_INDEX_RE.
> 
> Verified.
> 
> > Will you maintain the monotone plugin? I won't be able to maintain
> > plugins that I don't use daily. (Currently mercurial and CVS)
> 
> Absolutely, if it breaks I'll fix it.
> 

Hi Daniel
thx a lot for the patch. I try to start your monotone module for 'meld'
automatically during merge and propagate conflicts, but don't find the right
way. How can I start meld with your plugin in a way like:
meld --load-modules=monotone <file1> <file2> <file3> <merged_file>

Here's the part in my monotonerc
cat ~/.monotone/monotonerc
-------- snip 
function merge3_meld_cmd(left_path, anc_path, right_path, merged_path,
                           lfile, afile, rfile, outfile)
   return
   function()
      return execute("meld",
                     afile, lfile, rfile, outfile)
   end
end
-------- snip