Re: Patch problem with mercurial
- From: Vincent Legoll <vincent legoll gmail com>
- To: Edwin Vane <revane gmail com>
- Cc: meld-list gnome org
- Subject: Re: Patch problem with mercurial
- Date: Mon, 16 Mar 2009 15:36:48 +0100
2009/3/16 Edwin Vane <revane gmail com>:
> I re-updated to current trunk after reverting to meld 2.1. I've run across a
> patching problem with mercurial repo. Here's the info the new patch failure
> message box requested:
>
> Meld version: built from r1256 (1.2.1-svn)
> Source control: mercurial v1.1.2
>
> I'm afraid I can't post the diff but I did do some digging myself and when I
> look at the tmp directory where the patch was supposed to take place, I find
> that the file to be patched is empty so of course the patch fails to apply.
> That is, I cd to the directory given by the patch failure message box (it
> happens to be /tmp/tmpm1gvTB-meld) and then look at the file to be patched
> (let's call it blah.cpp). blah.cpp and blah.cpp.orig are both empty.
> blah.cpp.rej contains the rejected diff hunks (which is the entire diff).
Care to send 2 files exhibiting the problem for us to try reproducing the bug.
Maybe you could try to reproduce with files you are allowed to send us.
--
Vincent Legoll
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]