[Monotone-devel] Non-modal merge

2007-09-21 Thread Stefan Monnier
Bak when I used monotone for the first time, I was surprised to see that all the merge options provided were pretty much modal. So I came up with the code attached below (not on my own, it's largely copied from random bits on the Web, it's probably hideous for Lua experts). Is there such a tool

Re: [Monotone-devel] daemon support

2007-09-21 Thread Ben Walton
On 9/21/07, Jack Lloyd <[EMAIL PROTECTED]> wrote: > I haven't tested it but I did just look at the patch, I may do a new > build and try it on my server this weekend. My only comment would be I > don't see the reason to ever use daemon() - AFAICT the alternative > code does exactly the same things

Re: [Monotone-devel] daemon support

2007-09-21 Thread Jack Lloyd
On Fri, Sep 21, 2007 at 11:15:22AM -0400, Ben Walton wrote: > Has anyone had a chance (or the interest) to test this branch? If > not, are there objections to merging it with mainline? I haven't tested it but I did just look at the patch, I may do a new build and try it on my server this weekend.

Re: [Monotone-devel] daemon support

2007-09-21 Thread Ben Walton
Has anyone had a chance (or the interest) to test this branch? If not, are there objections to merging it with mainline? Thanks -Ben On 9/16/07, Ben Walton <[EMAIL PROTECTED]> wrote: > Ok, I've taken Ralf's suggestion and implemented a fallback daemon() > in case the target platform lacks it (I

[Monotone-devel] Re: Request for help adding monotone output to cvs2svn

2007-09-21 Thread Bruce Stephens
Patrick Georgi <[EMAIL PROTECTED]> writes: > Bruce Stephens schrieb: [...] >> For that matter, I guess it might be feasible to read git's >> fast-import format instead (that would probably take a bit more >> effort, but might be more useful). > I started such an effort, but considered it not wo

Re: [Monotone-devel] Re: Request for help adding monotone output to cvs2svn

2007-09-21 Thread Patrick Georgi
Bruce Stephens schrieb: > cared about this could hack a monotone backend in a day or two; > maybe longer if it turned out that monotone needed extra automate > features, but I'd guess it wouldn't now that there's a way to > commit revisions. automate is definitely enough for hg2mtn... > For that m

[Monotone-devel] Re: Request for help adding monotone output to cvs2svn

2007-09-21 Thread Bruce Stephens
Markus Schiltknecht <[EMAIL PROTECTED]> writes: [...] > Maybe cvs2svn is coming closer to being able to export to monotone. I don't think there's any question. There's (experimental, admittedly) code to export to git, and it's ~500 lines of Python. git is more or less equivalent to monotone in

Re: [Monotone-devel] SQL logic error, SQLite restore problems, etc.

2007-09-21 Thread Ralf S. Engelschall
On Thu, Sep 20, 2007, Nathaniel Smith wrote: > On Thu, Sep 20, 2007 at 01:42:48PM +0200, Ralf S. Engelschall wrote: > > For your information: as Joe Wilson discovered (and I was able to > > verify it) the problem is that Monotone still uses SQLite 3.4.2 while > > my sqlite3(1) above was already fr