Re: [darcs-devel] darcs patch: Add --dont-allow-conflicts to darcs pull.

2008-01-16 Thread Tommy Pettersson
On Wed, Jan 16, 2008 at 02:52:45AM +, Nicolas Pouillard wrote: Wed Jan 16 03:47:06 CET 2008 [EMAIL PROTECTED] * Add --dont-allow-conflicts to darcs pull. It also adds --allow-conflicts that is the default behavior of pull. I only looked at this patch quickly, but it looks like it

Re: [darcs-devel] darcs patch: Add --dont-allow-conflicts to darcs pull.

2008-01-16 Thread Nicolas Pouillard
Excerpts from Tommy Pettersson's message of Wed Jan 16 11:22:00 +0100 2008: On Wed, Jan 16, 2008 at 02:52:45AM +, Nicolas Pouillard wrote: Wed Jan 16 03:47:06 CET 2008 [EMAIL PROTECTED] * Add --dont-allow-conflicts to darcs pull. It also adds --allow-conflicts that is the

[darcs-devel] [issue590] Impossible case in darcs PatchRead.lhs or Patch/Read.lhs

2008-01-16 Thread Michael Abbott
New submission from Michael Abbott [EMAIL PROTECTED]: Running darcs get http://code.haskell.org/yi produces one of the following responses (depending on version). Running the darcs-1.0.9-i386-linux binary, as downloaded from darcs.net, produces the message: $ darcs get

Re: [darcs-devel] [issue589] Impossible case in darcs PatchRead.lhs or Patch/Read.lhs

2008-01-16 Thread Nicolas Pouillard
Excerpts from bugs's message of Wed Jan 16 15:11:24 UTC 2008: New submission from Michael Abbott [EMAIL PROTECTED]: [...] By the way, the page http://www.darcs.net/manual/node3.html suggests downloading the darcs repository from http://abridgegame.org/repos/darcs -- this appears to be

[darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread Nicolas Pouillard
Wed Jan 16 20:34:26 CET 2008 [EMAIL PROTECTED] * Add --{allow,dont-allow,mark}-conflicts to darcs pull. This patch also merge the --external option to pull_conflicts_options like with apply. New patches: [Add --{allow,dont-allow,mark}-conflicts to darcs pull. [EMAIL PROTECTED] This

Re: [darcs-devel] darcs patch: Add --dont-allow-conflicts to darcs pull.

2008-01-16 Thread Nicolas Pouillard
Excerpts from Nicolas Pouillard's message of Wed Jan 16 11:23:52 +0100 2008: Excerpts from Tommy Pettersson's message of Wed Jan 16 11:22:00 +0100 2008: On Wed, Jan 16, 2008 at 02:52:45AM +, Nicolas Pouillard wrote: Wed Jan 16 03:47:06 CET 2008 [EMAIL PROTECTED] * Add

Re: [darcs-devel] darcs patch: Add --dont-allow-conflicts to darcs pull.

2008-01-16 Thread Wagner Ferenc
Nicolas Pouillard [EMAIL PROTECTED] writes: Excerpts from Nicolas Pouillard's message of Wed Jan 16 11:23:52 +0100 2008: Excerpts from Tommy Pettersson's message of Wed Jan 16 11:22:00 +0100 2008: On Wed, Jan 16, 2008 at 02:52:45AM +, Nicolas Pouillard wrote: Wed Jan 16 03:47:06 CET 2008

Re: [darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread Tommy Pettersson
On Wed, Jan 16, 2008 at 07:36:30PM +, Nicolas Pouillard wrote: Wed Jan 16 20:34:26 CET 2008 [EMAIL PROTECTED] * Add --{allow,dont-allow,mark}-conflicts to darcs pull. This patch also merge the --external option to pull_conflicts_options like with apply. Hmmm... I don't think

Re: [darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread David Roundy
On Wed, Jan 16, 2008 at 09:18:15PM +0100, Tommy Pettersson wrote: On Wed, Jan 16, 2008 at 07:36:30PM +, Nicolas Pouillard wrote: Wed Jan 16 20:34:26 CET 2008 [EMAIL PROTECTED] * Add --{allow,dont-allow,mark}-conflicts to darcs pull. This patch also merge the --external option

[darcs-devel] a measurement of using 7z instead of gz to compress patches

2008-01-16 Thread zooko
In short, it probably isn't worth it, unless the new repository formats (which I haven't looked at) tend to bundle more patches together into one file for the compression tool to find redundancy in: Current: 37188 trunk-get/_darcs Each patch un-gzipped and 7zipped: 32684

Re: [darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread David Roundy
On Wed, Jan 16, 2008 at 03:40:15PM -0500, David Roundy wrote: On Wed, Jan 16, 2008 at 09:18:15PM +0100, Tommy Pettersson wrote: On Wed, Jan 16, 2008 at 07:36:30PM +, Nicolas Pouillard wrote: Wed Jan 16 20:34:26 CET 2008 [EMAIL PROTECTED] * Add --{allow,dont-allow,mark}-conflicts to

Re: [darcs-devel] announcing darcs 2.0.0pre2

2008-01-16 Thread David Roundy
On Thu, Jan 03, 2008 at 11:11:40AM +, Simon Marlow wrote: Anyhow, could you retry this test with the above change in methodology, and let me know if (a) the pull is still slow the first time and (b) if it's much faster the second time (after the reverse unpull/pull)? I think I've done

Re: [darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread David Roundy
On Wed, Jan 16, 2008 at 10:12:11PM +0100, Tommy Pettersson wrote: On Wed, Jan 16, 2008 at 03:50:36PM -0500, David Roundy wrote: On Wed, Jan 16, 2008 at 07:36:30PM +, Nicolas Pouillard wrote: Wed Jan 16 20:34:26 CET 2008 [EMAIL PROTECTED] * Add

Re: [darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

2008-01-16 Thread Tommy Pettersson
On Wed, Jan 16, 2008 at 10:12:11PM +0100, Tommy Pettersson wrote: Unfortunately one problem with using the same option is that the [DEFAULT] information is currently hard-coded in the option's description, i.e., Pull and Apply can't have the same option with different descriptions of which is

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

2008-01-16 Thread David Roundy
On Wed, Jan 16, 2008 at 02:13:56AM +0100, Petr Rockai wrote: Hi! Hi Petr, I've looked over your email (and enjoyed it--but not by laughing), and found a few places where I think there are problems. (cutting bits I'm not commenting on) The step, where user selects taken and cancelled branches

[darcs-devel] a measurement of using 7z instead of gz to compress patches

2008-01-16 Thread Stephen J. Turnbull
zooko writes: In short, it probably isn't worth it, unless the new repository formats (which I haven't looked at) tend to bundle more patches together into one file for the compression tool to find redundancy in: Better to use zip format than tar, as zip has an index (that's why it's

[darcs-devel] [issue592] Testing new PostgreSQL backend for the bug tracker. Please Ignore

2008-01-16 Thread Mark Stosberg
New submission from Mark Stosberg [EMAIL PROTECTED]: Just testing. -- messages: 2541 nosy: beschmi, droundy, kowey, markstos, tommy priority: urgent status: unread title: Testing new PostgreSQL backend for the bug tracker. Please Ignore __ Darcs bug

Re: [darcs-devel] a measurement of using 7z instead of gz to compress patches

2008-01-16 Thread zooko
On Jan 16, 2008, at 6:02 PM, Stephen J. Turnbull wrote: Better to use zip format than tar, as zip has an index (that's why it's used by jar files and Python eggs, IIRC). Doesn't 7zip have a full archive mode like zip? Yes, it does. It didn't occur to me to use it for these measurements,

[darcs-devel] DARCS correctness question

2008-01-16 Thread William Uther
Hi, I have brief question about DARCS correctness. I must admit to being more familiar with Operational Transformation theory better than Darcs theory of patches, but I believe the two are very similar. There is a brief intro to OT theory here: http://

Re: [darcs-devel] a measurement of using 7z instead of gz to compress patches

2008-01-16 Thread Stephen J. Turnbull
zooko writes: On Jan 16, 2008, at 6:02 PM, Stephen J. Turnbull wrote: Better to use zip format than tar, as zip has an index (that's why it's used by jar files and Python eggs, IIRC). Doesn't 7zip have a full archive mode like zip? Yes, it does. It didn't occur to me to use