Matt Kraai <kraai@ftbfs.org> writes:

> Package: darcs
> Version: 1.0.5-3
>
> When I try to pull all of the changes from the upstream directory to
> the debian directory, darcs fails:

Does running 'darcs repair' actually fix the problem, or not?

Darcs upstream, is this a known bug?

peace,

  isaac

>> $ cd debian
>> $ darcs pull --all ../upstream
>> Pulling from "../upstream"...
>> 
>> darcs failed:  user error (Error applying patch to recorded.
>> Running 'darcs repair' on the target repo may help.
>> user error (Error applying hunk to file ./ChangeLog))
>> Your repository is now in an inconsistent state.
>> This must be fixed by running darcs repair.
>> 
>> 
>>
>
> You can download a tarball of the two repositories from
>
>  http://people.debian.org/~kraai/unpullable.tar.gz
>
> -- 
> Matt

On Tue, Jan 17, 2006 at 11:11:19PM -0800, Isaac Jones wrote:
> Matt Kraai <kraai@ftbfs.org> writes:
> 
> > Package: darcs
> > Version: 1.0.5-3
> >
> > When I try to pull all of the changes from the upstream directory to
> > the debian directory, darcs fails:
> 
> Does running 'darcs repair' actually fix the problem, or not?

When I run 'darcs repair' in the upstream directory, it produces the
following error message:

> Applying patch 24 of 24... done.
> Unapplicable patch:
> Thu Jan 12 15:45:45 PST 2006  Matt Kraai <kraai@ftbfs.org>
>   * Imported autogen-5.8.1
>   into Darcs repository
> 
> 
> 
> darcs failed:  Error applying hunk to file ./ChangeLog

I guess this is the cause of the unpullable patch.

On Wed, Jan 18, 2006 at 07:19:01AM +0000, Matt Kraai wrote:
> When I run 'darcs repair' in the upstream directory, it produces the
> following error message:
> 
> > Applying patch 24 of 24... done.
> > Unapplicable patch:
> > Thu Jan 12 15:45:45 PST 2006  Matt Kraai <kraai@ftbfs.org>
> >   * Imported autogen-5.8.1
> >   into Darcs repository
> > 
> > darcs failed:  Error applying hunk to file ./ChangeLog
> 
> I guess this is the cause of the unpullable patch.

The upstream repo somehow got corrupted. When this happens it is
usually not darcs fault but some other program that has recursed
down into the _darcs metadata dir and accidently modified
darcs's internal views of the repo. But sometimes it has shown
to be bugs in darcs that corrupts a repo. Two such bugs were
fixed in 1.0.6; one could happen with 'darcs get --tag' on a
repo with "out of order" patches, and one could happen when
applying hunk patches with special conditions. It is probably
impossible to tell from just a corrupted repo if one of these
bugs caused the corruption, or if there is still a bug in darcs.

Folks, I'm resolving this by fiat.

The problem is that we don't have a way of telling if there really is a darcs
bug or not, so there's not much we can do with this.

There is a feature request to make darcs more resistant to corruption from
outside tools (issue230 : single file pristine cache), so hopefully if somebody
implements this, this kind of thing would happen a lot less often.