[darcs-users] Re: Unapplicable patch error

[Nimrod A. Abing]

Hi,

I've had the same problem before. The problem lies in the way Windows
handles filename CamelCasing. AFAIK it depends on the tools that you
are using to copy files between say an EXT3 filesystem a FAT32 or NTFS
filesystem.

Follow this thread for the discussion:

http://www.abridgegame.org/pipermail/darcs-users/2005-October/008480.html

If you're in a hurry to find the solution (it worked for me):

http://www.abridgegame.org/pipermail/darcs-users/2005-October/008539.html

On 6/14/06, David K. Hess <dhess at verscend.com> wrote:
>
> After more investigation, it looks like it is not a CR/NL issue.
>
> The patch in question has the following in relation to the file that
> is failing:
>
> [other hunks]
> addfile Myfile
> hunk Myfile
> [Myfile contents with a '+' on every row]
> hunk myfile
> [myfile contents with a '-' on every row]
> rmfile myfile
> [other hunks]
>
> The error that results:
>
> Applying patch 14 of 56... Unapplicable patch:
> [...]
> darcs failed:  Error applying hunk to file ./myfile
>
> So, in other words, this patch involved renaming myfile -> Myfile
> using add and remove instead of move (doh!) plus some changes to the
> contents. On a Linux system, this works just fine. On a Windows
> system (and MacOS) it is failing, I assume because myfile and Myfile
> are the same thing in the filesystem.
>
> Is this a bug? Or just a simple case of gun meet foot? If the latter,
> is there anything simple I can do about it? Can I edit the patch to
> convert this from an add/remove to a move? Or would it work to just
> move the rmfile above the addfile inside the patch?
>
> Thanks.
>
> Dave
>
> ------
> David K. Hess
> Verscend Technologies, Inc.
> dhess at verscend.com
> 214-684-5448
>
>
>
> On Jun 4, 2006, at 2:18 AM, Juliusz Chroboczek wrote:
>
> >> I'm using darcs 1.0.7 and am getting an unapplicable patch error when
> >> get'ing a repository from linux to a windows workstation over scp.
> >
> > Are you using Cygwin scp?  Does it look like
> >
> >   http://thread.gmane.org/gmane.comp.version-control.darcs.user/8569
> >
> > ?
> >
> >                                         Juliusz
> >
> >
> > _______________________________________________
> > darcs-users mailing list
> > darcs-users at darcs.net
> > http://www.abridgegame.org/mailman/listinfo/darcs-users
>
>
> _______________________________________________
> darcs-users mailing list
> darcs-users at darcs.net
> http://www.abridgegame.org/mailman/listinfo/darcs-users
>


-- 
_nimrod_a_abing_

"The world is a tragedy to those who feel and a comedy to those who
think." - Shakespeare