nasty bug when applying patches
Dominik Psenner
dpsenner at gmail.com
Thu Apr 5 08:58:41 CDT 2012
>It only happens when applying a patch containing a git rename from a file
>without a space to a file with a space. I suppose most people either create
>files directly with spaces, or move away from spaces, not the opposite.
>
>> So far I observed that given the patch:
>> # HG changeset patch
>> # User test
>> # Date 0 0
>> # Node ID d9adadb0607aa6f297ed276355f02bbbac150078
>> # Parent b223f2abdff27a2eeedefd683322f9533a0186c6
>> 1
>>
>> diff --git a/d/f b/d 2/f
>> rename from d/f
>> rename to d 2/f
>> --- a/d/f
>> +++ b/d 2/f
>
>FWIW, if you have to redo this, edit the patch and end the line above with
>a TAB.
>
>> @@ -1,1 +1,2 @@
>> f
>> +f
>
>Here is a patch:
>
> http://selenic.com/pipermail/mercurial-devel/2012-April/039002.html
Great news! Good to know that there's even a workaround but for now I'm
going to make sure won't run into the same problem again until the next
release ships me a new version.
Thanks Patrick!
More information about the Mercurial-devel
mailing list