Re: [Monotone-devel] workspace merge status update

2006-09-03 Thread Zack Weinberg
On 9/2/06, Nathaniel Smith [EMAIL PROTECTED] wrote: On Sat, Sep 02, 2006 at 08:50:02PM -0700, Zack Weinberg wrote: One thing doesn't make sense -- there is commentary on the need to fix up the absolute paths in _MTN/options of the saved workspaces, and there are indeed absolute paths in those

Re: [Monotone-devel] workspace merge status update

2006-09-03 Thread Nathaniel Smith
On Sun, Sep 03, 2006 at 12:59:47AM -0700, Zack Weinberg wrote: No, I mean, we go on to run monotone commands in the reconstituted working directory, I don't see how that is managing to work. (And it seems to me it would be good to do a little more -- compare automate inventory output,

Re: [Monotone-devel] workspace merge status update

2006-09-03 Thread Zack Weinberg
On 9/2/06, Nathaniel Smith [EMAIL PROTECTED] wrote: On Sat, Sep 02, 2006 at 08:50:38PM -0700, Zack Weinberg wrote: What remains to be done before the branch can be merged? Whatever (if anything) is still outstanding from the last review, I guess. Plus perhaps that truncated comment in

Re: [Monotone-devel] workspace merge status update

2006-09-02 Thread Nathaniel Smith
On Thu, Aug 31, 2006 at 02:50:14PM -0700, Zack Weinberg wrote: I've made some but not all of the changes Nathaniel requested to the .migration branch. The big remaining lack is that testing still doesn't work the way he wanted (mainly because I am having no luck figuring out how to do that).

Re: [Monotone-devel] workspace merge status update

2006-09-02 Thread Zack Weinberg
On 9/2/06, Nathaniel Smith [EMAIL PROTECTED] wrote: On Thu, Aug 31, 2006 at 02:50:14PM -0700, Zack Weinberg wrote: I've made some but not all of the changes Nathaniel requested to the .migration branch. The big remaining lack is that testing still doesn't work the way he wanted (mainly

[Monotone-devel] workspace merge status update

2006-08-31 Thread Zack Weinberg
It's been a while, but I'm back on the trail of workspace merge. Summer of Code is formally over at this point, but UCSD doesn't start back up until late September, so I intend to keep working until then. (I probably won't have time after classes start, but you never know.) I've made some but