cannot push patch??

Patrick Waugh ptwaugh at gmail.com
Sat Oct 11 15:33:22 UTC 2008


Martin,

On Sat, Oct 11, 2008 at 4:05 AM, Martin Geisler <mg at daimi.au.dk> wrote:
> "Patrick Waugh" <ptwaugh at gmail.com> writes:
>
>> OMG, too funny.
>>
>> Luckily, I discovered the "hg series" command so I can double check
>> the spelling.  =)
>
> You could also just use 'hg qpush' twice without a patch name, much
> easier :-)

Interesting, I'll have to try that.


>> I also figured out my other problem was becasue I was trying to track
>> changing .gif files, which after re-reading the docs, I see is not
>> currently possible.
>
> If by not possible you mean that you cannot diff the files because they
> are binary, then you just need to enable the git diff format:
>
> [diff]
> git = 1
>
> That will enable diffing binary files, but the normal patch command
> (/usr/bin/patch) wont understand the diffs. The internal patch in hg
> will, of course, so this is probably not a problem.

Well, what I was doing, was:

hg qnew -m "Replace .gif file" new_graphic.patch

< replace old .gif with new custom .gif >

hg qrefresh

But, when I would pop then try to push that patch, it would tell me
there is garbage in the patch.  So, I will try this with git = 1.

Thanks



More information about the Mercurial mailing list