[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

>From reading this bug history, it is "resolved-in-unstable", and Tommy is in >the process of porting this fix to darcs-stable, so that it can be resolved there, too. -- status: need-eg -> resolved-in-unstable __ Darcs bug tracker <[EMAIL PROTECTED]>

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson wrote: > Tommy Pettersson <[EMAIL PROTECTED]> added the comment: > > On Sat, Jan 12, 2008 at 10:00:10PM -, Tommy Pettersson wrote: >> An alternative is to switch to the current darcs-stable, which I > > Darn, that is not true. > > The bug is actually a known bug. A backport

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson <[EMAIL PROTECTED]> added the comment: On Mon, Jan 14, 2008 at 10:29:46PM -, David Roundy wrote: > Tommy, have you been able to check with darcs2? I imagine that it's > fixed there, if you backported the fix from unstable... Yes, darcs2 worked fine on zooko's repo. I'll see

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

David Roundy <[EMAIL PROTECTED]> added the comment: Tommy, have you been able to check with darcs2? I imagine that it's fixed there, if you backported the fix from unstable... On Jan 12, 2008 4:50 PM, Tommy Pettersson <[EMAIL PROTECTED]> wrote: > I can reproduce this bug with darcs 1.0.9. The ve

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

David Roundy <[EMAIL PROTECTED]> added the comment: On Jan 12, 2008 8:38 PM, zooko <[EMAIL PROTECTED]> wrote: > On Jan 12, 2008, at 2:33 PM, Tommy Pettersson wrote: > > On the other hand, darcs2 has the new GADT testing and better > > unit testing, so darcs2 might already be even more safe with t

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

On Jan 12, 2008, at 2:33 PM, Tommy Pettersson wrote: > On the other hand, darcs2 has the new GADT testing and better > unit testing, so darcs2 might already be even more safe with the > old repo format than darcs1, even without real world testing. By > looking at the reported bugs it has mostly be

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

On Jan 12, 2008, at 1:46 PM, Nathan wrote: > I'm sorry, I didn't realize this tarball is over 15 MB until I tried > sending email. Is there another delivery method I could use? > (Perhaps I can post this tarball to the allmydata.org site somewhere?) How about https://zooko.com --Z

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson <[EMAIL PROTECTED]> added the comment: On Sat, Jan 12, 2008 at 10:00:10PM -, Tommy Pettersson wrote: > An alternative is to switch to the current darcs-stable, which I Darn, that is not true. The bug is actually a known bug. A backport exists (which is why I wrongly thought

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson <[EMAIL PROTECTED]> added the comment: Well, one easy starter is that it is _darcs/patches/pending that's guilty. So here's the quick workaround (for push-only repos): in the apply post-hook do "rm _darcs/patches/pending" An alternative is to switch to the current darcs-stabl

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson <[EMAIL PROTECTED]> added the comment: I can reproduce this bug with darcs 1.0.9. The very current (just did a push) darcs-stable 1.1.0pre doesn't trigger the bug. I'll start a darcs Trackdown to see if that gives any easy clues. __ Darcs bug trac

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

> > I've got the tarball, but I'm not clear how to use it to reproduce > the bug. > I don't see any problems there (e.g. no unrecorded changes), but I > only > looked with the latest darcs-unstable and the darcs 1.0.9rc1 that > is in > etch, so it may be that the bug appeared and disappeared

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

David Roundy <[EMAIL PROTECTED]> added the comment: On Fri, Jan 11, 2008 at 11:27:35PM -, Zooko wrote: > If you can't untar that tarball, or if you can't detect a bug in that > repo, then please ask me and I will be happy to help reproduce the bug. I've got the tarball, but I'm not clear h

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Zooko <[EMAIL PROTECTED]> added the comment: My brother Nejucomo just got a similar error -- pull silently succeeded and then left unrecorded changes -- on Ubuntu 7.04 with darcs 1.0.9rc2. He had a much older version of our repository, and he pulled to become up to date with our current re

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Zooko <[EMAIL PROTECTED]> added the comment: Okay, here's what I know so far: My coworker Rob wrote a patch on his Mac machine, using darcs 1.0.8 from MacPorts. This is the patch (visible on our trac+darcs): [1]. He pushed this patch to our dev.allmydata.com machine, which is Linux and is

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

David Roundy <[EMAIL PROTECTED]> added the comment: On Fri, Jan 11, 2008 at 12:39:13PM -0800, zooko wrote: > So fortunately for the prospects of making progress on this bug, but > unfortunately for the prospects of the allmydata.org project > continuing to use darcs, this bug just bit us agai

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

So fortunately for the prospects of making progress on this bug, but unfortunately for the prospects of the allmydata.org project continuing to use darcs, this bug just bit us again. The first thing I need to do is work around it so that it doesn't impede my co-workers. Then I will try to m

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Mark Stosberg <[EMAIL PROTECTED]> added the comment: I'm changing the status to "Need example", since knowing more details about how to reproduce this seem critical to addressing it. I'm particularly interested to know if might also be "resolved in unstable". -- nosy: +markstos status:

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

>> and then later it >> turned out that there was an incompatibility between the new >> 1.1.0pre and our version of the tailor tool, so I put the original >> darcs-1.0.9 back. > > Uhm, how is that? Can you point me in the right direction to fix the > problem? And what is "1.1.0pre"? I thought we we

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

On Fri, 4 Jan 2008 14:48:39 -0700 zooko <[EMAIL PROTECTED]> wrote: > and then later it > turned out that there was an incompatibility between the new > 1.1.0pre and our version of the tailor tool, so I put the original > darcs-1.0.9 back. Uhm, how is that? Can you point me in the right directio

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Thanks for looking at this, David. I'm busy on the imminent v0.7.0 release of our secure, decentralized filesystem, http://allmydata.org , so after this message I probably won't look at this more until next week. On Jan 3, 2008, at 3:09 PM, David Roundy wrote: > * Can you confirm that you ac

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

David Roundy <[EMAIL PROTECTED]> added the comment: [helpful instructions snipped...] > > Unfortunately, the machine where things work okay is not the central > development machine for the project. ;-/ Alas, this is a most puzzling bug. As you might imagine, I've been unable to reproduce th

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Tommy Pettersson <[EMAIL PROTECTED]> added the comment: I'm terribly not updated on darcs right now, but I believe there are no (known) important bugs that can mess up a "push only" repo. A quick search gives: Sun Jan 28 01:22:06 CET 2007 David Roundy <[EMAIL PROTECTED]> * fix bug trigger

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

I built today's darcs stable on our development server and now when I run the test of pushing from "xyz/trunk" to "xyz/central-on-dev", the bug does not manifest itself. Are the symptoms I reported suggestive of any known bug that was fixed between 1.0.9 release and today on the stable branc

Re: [darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Well, this is weird. Taking this tarball: https://zooko.com/buggydarcsrepo and cd'ing into xyz/trunk, and running "darcs push -a ../central-on- dev" triggers this bug on one machine, but does not trigger it on another machine even though both are running darcs-1.0.9 release version. Unfort

[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

New submission from Zooko <[EMAIL PROTECTED]>: Folks: This is a minor disaster for me, as the central, canonical, append- only repository of my company and my open source project, http:// allmydata.org , is corrupted in a way that will probably interfere with our operations. So I will be gr