Re: [Monotone-devel] how to merge trees

2005-08-22 Thread Nathaniel Smith
On Tue, Aug 16, 2005 at 03:38:30AM -0700, Nathaniel Smith wrote: Either way, after we've merged all scalars using the above rules, we need to do one more thing -- scan for what I've been calling structural conflicts. It's possible that after we've done the local scalar merging, we may still

Re: [Monotone-devel] resend : i18n

2005-08-22 Thread Nathaniel Smith
On Sat, Aug 20, 2005 at 11:06:15AM -0700, Nathaniel Smith wrote: It seems clear that F() is not actually the optimal marker for i18nable text; in particular, it's sometimes used to do things like build SQL strings... (though these could use boost::format directly, I suppose...) Right, after

Re: [Monotone-devel] resend : i18n

2005-08-22 Thread Zbynek Winkler
Nathaniel Smith wrote: On Sat, Aug 20, 2005 at 11:06:15AM -0700, Nathaniel Smith wrote: It seems clear that F() is not actually the optimal marker for i18nable text; in particular, it's sometimes used to do things like build SQL strings... (though these could use boost::format directly, I

Re: [Monotone-devel] resend : i18n

2005-08-22 Thread Jon Bright
Zbynek Winkler wrote: This does not work for some languages. For example in czech we have 1 zvonek 2, 3 and 4 zvonky 5 and more zvonků I don't speak Russian, but I happen to know that something similar happens there in some circumstances. -- Jon Bright Silicon Circus Ltd.

Re: [Monotone-devel] resend : i18n

2005-08-22 Thread Nathaniel Smith
On Mon, Aug 22, 2005 at 04:57:40PM +0200, Zbynek Winkler wrote: Nathaniel Smith wrote: Current policy (the best one I could come up with): F() marks strings that should be translated For strings that should be translated and involve plurals, use: FP(%i doorbell, %i doorbells, count) % count

[Monotone-devel] new to monotone

2005-08-22 Thread Howard Spindel
Hello, I've been using monotone for about a month. I have a one-person project, so primarily I just wanted something to track history and allow me to recreate old releases if I had to. So far, I like monotone. Couple questions, and I apologize if they are newbie stuff: 1. I installed

Re: [Monotone-devel] new to monotone

2005-08-22 Thread Matthew Gregan
At 2005-08-22T16:41:45-0700, Howard Spindel wrote: 1. I installed monotone 0.20 originally. I saw no problems with it. Yesterday I tried upgrading to monotone 0.22. After the upgrade, the diff function no longer works - I get the Windows popup box that says the program attempted an illegal

Re: [Monotone-devel] Rename failed

2005-08-22 Thread Richard Levitte - VMS Whacker
In message [EMAIL PROTECTED] on Mon, 22 Aug 2005 17:18:26 -0700, Nathaniel Smith [EMAIL PROTECTED] said: njs All that's wrong here is that monotone update .mt-attrs when you njs said rename, but it didn't actually rename the files for you -- njs we know this is annoying :-) -- so until you

Re: [Monotone-devel] new to monotone

2005-08-22 Thread Howard Spindel
At 02:03 PM 8/23/2005 +1200, Matthew Gregan wrote: The database is not encrypted. So if I have a backup on a public ISP can anybody with SQL read my database? (assuming the file had public permissions) Thanks, Howard ___ Monotone-devel

Re: [Monotone-devel] Rename failed

2005-08-22 Thread Nathaniel Smith
On Tue, Aug 23, 2005 at 06:18:45AM +0200, Richard Levitte - VMS Whacker wrote: In message [EMAIL PROTECTED] on Mon, 22 Aug 2005 17:18:26 -0700, Nathaniel Smith [EMAIL PROTECTED] said: njs All that's wrong here is that monotone update .mt-attrs when you njs said rename, but it didn't

Re: [Monotone-devel] new to monotone

2005-08-22 Thread Nathaniel Smith
On Mon, Aug 22, 2005 at 09:29:24PM -0700, Howard Spindel wrote: At 02:03 PM 8/23/2005 +1200, Matthew Gregan wrote: The database is not encrypted. So if I have a backup on a public ISP can anybody with SQL read my database? (assuming the file had public permissions) Yes, if they can read