Re: [Monotone-devel] Server fails to start up because it messes with MT directory

2005-05-07 Thread Nathaniel Smith
On Sat, May 07, 2005 at 12:25:16AM -0500, Timothy Brownawell wrote: It's trying to read MT/options. Since anything in this file can be put on the command line (so it's not critical to be able to read this), here's a patch to turn this into a warning. If there are no objections, I'll merge it

Re: [Monotone-devel] Re: CLI / path restrictions.

2005-05-07 Thread Nathaniel Smith
On Fri, May 06, 2005 at 10:27:49PM +0200, Bruno Hertz wrote: Hmm. Looking at common tools (like ls, chmod or whatever), restriction to pwd is the default, and recursiveness must explicitly be requested, like per '-R' option (OK, not possible with ls, of course). 'find' is one of the notable

Re: [Monotone-devel] Server fails to start up because it messes with MT directory

2005-05-07 Thread Timothy Brownawell
On 5/7/05, Nathaniel Smith [EMAIL PROTECTED] wrote: On Sat, May 07, 2005 at 12:25:16AM -0500, Timothy Brownawell wrote: It's trying to read MT/options. Since anything in this file can be put on the command line (so it's not critical to be able to read this), here's a patch to turn this into

[Monotone-devel] Re: CLI / path restrictions.

2005-05-07 Thread Bruno Hertz
Nathaniel Smith [EMAIL PROTECTED] writes: It actually had never occurred to me that one might expect giving a directory to mean only the first level of stuff in that directory; maybe we need a straw poll on what people's intuitions here are? Who ever called 'ls' with a directory name as param

Re: [Monotone-devel] Re: CLI / path restrictions.

2005-05-07 Thread Derek Scherger
Bruno Hertz wrote: Who ever called 'ls' with a directory name as param might think different. Shell expansion is non recursive either. Actually, most commands work non recursive without explicit request. Take rm -rf as another example. conversely, cvs diff dir etc. do act recursively, iirc,

Re: [Monotone-devel] CLI / path restrictions.

2005-05-07 Thread Derek Scherger
Nathaniel Smith wrote: Hardest part is coming up with a sensible way for the user to express this desire -- any suggestions? off the top of my head --local (a la cvs) comes to mind... Though I guess the semantics of listing a directory are not totally clear; if I say 'log foo/', and there's

[Monotone-devel] Re: merge weirdness...

2005-05-07 Thread Wim Oudshoorn
I am at the moment just playing with monotone, but after reading the e-mail below I started to think a little bit about how to pick an ancestor for merging. It is quite an interesting problem, and quite tricky because for me it seems very hard to make precise what properties you want for a merge

[Monotone-devel] mtbrowser - Text based browser for source control

2005-05-07 Thread Henry Nestler
For some simple browsing in revisions database, I wrote this tool from shell script. It use only dialog and some simple shell tools (cut, cat echo, head, tail, sort, ...). Is not full futured. I wrote this only in some hours today. Is very simple to handle and fast. The longest time it need to get

[Monotone-devel] Re: CLI / path restrictions.

2005-05-07 Thread Bruno Hertz
Derek Scherger [EMAIL PROTECTED] writes: certainly, given the same args and possibly --local option, commit, status, diff, revert should all act on the same things! Sure. Without path spec on the entire working copy, else on the path(s) specified. And, as said, after taking the pain of

Re: [Monotone-devel] Re: 3-way merge considered harmful

2005-05-07 Thread Oren Ben-Kiki
May 2005 00:29:48 -0700, Nathaniel Smith [EMAIL PROTECTED] said: njs Here's another pathological case for 3-way merge: njsA njs| njsB njs / \ njs C D I'd like to throw in $0.02 worth here. First, this problem has nothing to do with project file operations. The same

Re: [Monotone-devel] Re: 3-way merge considered harmful

2005-05-07 Thread Oren Ben-Kiki
May 2005 00:29:48 -0700, Nathaniel Smith [EMAIL PROTECTED] said: njs Here's another pathological case for 3-way merge: njsA njs| njsB njs / \ njs C D I'd like to throw in $0.02 worth here. First, this problem has nothing to do with project file operations. The same

[Monotone-devel] Re: How new-style codeville merge works

2005-05-07 Thread Bruce Stephens
Nathaniel Smith [EMAIL PROTECTED] writes: FYI: http://thread.gmane.org/gmane.comp.version-control.revctrl/2 Oh. If I understand correctly, then it sounds like the basic storage that everone's using is suboptimal, and really SCMs should store a big database of lines, and files get stored as

Re: [Monotone-devel] monotone 0.19 - how long should a fresh pull take?

2005-05-07 Thread Matthew Gregan
At 2005-05-07T08:37:14-0700, Joe Wilson wrote: $ time monotone --db=mt.db --key= pull off.net net.venge.monotone ... real223m5.784s user219m30.140s sys 0m9.827s I'm assuming you have an adequate network connection, because obviously pull will take a long time if your network

Re: [Monotone-devel] Re: How new-style codeville merge works

2005-05-07 Thread Nathaniel Smith
On Sat, May 07, 2005 at 11:56:03PM +0100, Bruce Stephens wrote: Nathaniel Smith [EMAIL PROTECTED] writes: FYI: http://thread.gmane.org/gmane.comp.version-control.revctrl/2 Oh. If I understand correctly, then it sounds like the basic storage that everone's using is suboptimal, and

[Monotone-devel] [patch] add ticker for revisions written to netsync; change tick_write_count format

2005-05-07 Thread Timothy Brownawell
Pull can take a long time to sanity-check revisions (especially on initial pull to a fresh db), and doesn't provide any feedback during this. This patch lets packet_consumer and children run a callback when a revision is written out. Netsync then uses this to add a ticker for revisions written. Is