Re: [darcs-devel] a couple of quick timings

2008-02-06 Thread Petr Rockai
Hi, zooko [EMAIL PROTECTED] writes: Also, what's the memory use look like? Could this be an effect of swapping? No it can't, because I don't have swap on this machine. :-) I know that the memory use is below 500 MB, or else it would have crashed because I have only 500 MB on this

Re: [darcs-devel] Alternative conflict resolution scheme.

2008-01-18 Thread Petr Rockai
Hi again, sorry that this took a little longer than I have expected... Thanks for the reply as well, now let me try to address your comments. And pretty please, pardon my ignorance (no irony) -- I am pretty unexperienced with the theory and it may very well be that there is some fundamental

[darcs-devel] Alternative conflict resolution scheme.

2008-01-15 Thread Petr Rockai
Hi! We have been doing some brainstorming in #darcs about a possible alternative conflict resolution scheme. I will try to summarise it for the list, and it would be very welcome, if you could find problems with it. I will start with the easy bit: UI. We would, when recording a patch in a

Re: [darcs-devel] announcing darcs 2.0.0pre1, the first prerelease for darcs 2

2007-12-15 Thread Petr Rockai
David Roundy [EMAIL PROTECTED] writes: Okay, I've found a couple of really stupid bits of code, and this goes a lot faster now. The 17 pull took under three seconds, and that's with profiling running. Fortunately (and perhaps unsurprisingly) the issue was largely with the easy parts of the

Re: [darcs-devel] announcing darcs 2.0.0pre1, the first prerelease for darcs 2

2007-12-14 Thread Petr Rockai
Hi, first of all, hats off for the progress you have made! David Roundy [EMAIL PROTECTED] writes: The future of darcs is in the darcs-2 repository format, which features a new merge algorithm that introduces two major user-visible changes 1. It should no longer be possible to confuse darcs

Re: [darcs-devel] [issue555] Possibility to return to a previous version without loosing the changes

2007-11-23 Thread Petr Rockai
Hi, Eric Kow writes: I understand. Bzr has this feature, I think. Personally, I'm not keen on the idea, because it introduces new commands/flags into darcs. But I can also see that it might be very useful. If anybody wants to implement it, perhaps a good user interface for it would be to