[Monotone-devel] Re: Testsuite status (SoC)

2006-07-12 Thread Timothy Brownawell
On Wed, 2006-07-05 at 23:39 -0500, Timothy Brownawell wrote: There is minimal documentation in tester.txt and testsuite.txt now, currently only having short descriptions of the available functions. I've also fixed a problem where the tester couldn't set env vars reliably, and a place where a

[Monotone-devel] Workspace merge status (SoC)

2006-07-12 Thread Zack Weinberg
My 'ooh shiny!' feature (diff -p) has made it to mainline, and I hope that the multihead merge heuristic will follow soon. I've also got a number of mails to respond to. I now consider myself sufficiently familiar with the structure of the code that I can actually tackle the real project, and

[Monotone-devel] Dumb Question

2006-07-12 Thread Rob Schoening
Is there a recommended way to roll a particular file or files back to a particular revision? mtn update affects the entire workspace, which I don't want. Obviously mtn cat -r revision foo.txt foo.txt will work, but this seems wrong. Is it? Or is there a better way? RS

Re: [Monotone-devel] Dumb Question

2006-07-12 Thread Timothy Brownawell
On Wed, 2006-07-12 at 12:20 -0700, Rob Schoening wrote: Is there a recommended way to roll a particular file or files back to a particular revision? mtn update affects the entire workspace, which I don't want. Obviously mtn cat -r revision foo.txt foo.txt will work, but this seems wrong.

[Monotone-devel] Re: Dumb Question

2006-07-12 Thread Koen Kooi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Timothy Brownawell schreef: On Wed, 2006-07-12 at 12:20 -0700, Rob Schoening wrote: Is there a recommended way to roll a particular file or files back to a particular revision? mtn update affects the entire workspace, which I don't want.

Re: [Monotone-devel] Re: Dumb Question

2006-07-12 Thread Jeronimo Pellegrini
On Wed, Jul 12, 2006 at 09:38:58PM +0200, Koen Kooi wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Timothy Brownawell schreef: On Wed, 2006-07-12 at 12:20 -0700, Rob Schoening wrote: Is there a recommended way to roll a particular file or files back to a particular revision? mtn

[Monotone-devel] Re: Dumb Question

2006-07-12 Thread Bruce Stephens
Koen Kooi [EMAIL PROTECTED] writes: Timothy Brownawell schreef: On Wed, 2006-07-12 at 12:20 -0700, Rob Schoening wrote: Is there a recommended way to roll a particular file or files back to a particular revision? mtn update affects the entire workspace, which I don't want. Obviously mtn

Re: [Monotone-devel] Re: Dumb Question

2006-07-12 Thread Bruce Stephens
Koen Kooi [EMAIL PROTECTED] writes: [...] In an ideal gui one would use revert -rrev to go back in ancestry and update -rrev to walk down the family tree. Maybe. I think this use of revert was intended to allow arbitrary rev, so it would work forwards and backwards (and sideways). Anyway,

Re: [Monotone-devel] Re: Dumb Question

2006-07-12 Thread Nathaniel Smith
On Wed, Jul 12, 2006 at 09:38:58PM +0200, Koen Kooi wrote: Timothy Brownawell schreef: On Wed, 2006-07-12 at 12:20 -0700, Rob Schoening wrote: Is there a recommended way to roll a particular file or files back to a particular revision? mtn update affects the entire workspace, which I

Re: [Monotone-devel] Re: Dumb Question

2006-07-12 Thread Nathaniel Smith
On Wed, Jul 12, 2006 at 09:49:13PM +0100, Bruce Stephens wrote: A restrictions version of pluck would do much what I imagine you'd expect update to do. I suspect that would be easily accepted and understood by users. Committed to mainline last week. Rather an overcomplicated interface when

Re: [Monotone-devel] Re: Dumb Question

2006-07-12 Thread Nathaniel Smith
On Wed, Jul 12, 2006 at 10:25:50PM +0200, Koen Kooi wrote: In an ideal gui one would use revert -rrev to go back in ancestry and update -rrev to walk down the family tree. Anyway, if monotone can do 'update -ra long time ago' it should be able to 'update' files in a similiar command,

Re: [Monotone-devel] Re: branch review for net.venge.monotone.multihead

2006-07-12 Thread Nathaniel Smith
On Tue, Jul 11, 2006 at 06:40:54PM -0700, Zack Weinberg wrote: I rewrote CMD(merge) again according to your suggestions; please have a look? I made a few small tweaks (message tweaks, adding a safe_insert, tweaking the test to document the real old algorithm). Looks good! Merged to mainline.

Re: [Monotone-devel] Re: branch review for net.venge.monotone.multihead

2006-07-12 Thread Zack Weinberg
On 7/12/06, Nathaniel Smith [EMAIL PROTECTED] wrote: On Tue, Jul 11, 2006 at 06:40:54PM -0700, Zack Weinberg wrote: I was thinking about using commit date as a further heuristic, i.e. when we have two LCAs neither of which is an ancestor of the other, merge the newest one first; furthermore,