On Tue, Jun 24, 2008 at 1:00 AM, Robert Stocks <[EMAIL PROTECTED]> wrote:
> Charles, > > I have no idea what is going wrong, I rarely use diff/patch myself, > however.. > > 1. I am on windows (line endings?) > I'm on windows too, and the line endings are the same as all the other patches I've applied (LF only). It turned out that adding the "-l" option to ignore whitespace differences did the trick. Perhaps the difference comes from doing cut/paste out of an email. 2. The patch was generated by the command svn diff > src\report\standard-reports\register.scm > mypatch.txt > 3. I belive the patch format is in Unified Diff format (-u option to patch) > 4. I have attached the entire file (after svn update to r17246) and > with your comments regarding calling the field "memo" not "split > description" applied. > Thanks. Since you've already added the "memo" changes, I'll forget about the patch and try to test this version later today. Cheers, Charles > > 2008/6/24 Charles Day <[EMAIL PROTECTED]>: > > I've just tried applying the patch and I get the following problem. Any > idea > > what's going wrong? (I don't use "patch" very often, so I won't be > > surprised if I'm doing something stupid.) If I can apply this patch and > it > > tests out OK, I'll commit it. > > > > Cheers, > > Charles > > > > $ patch -p0 < ~/patch/rstocks.txt > > patching file `src/report/standard-reports/register.scm' > > Hunk #1 FAILED at 26. > > Hunk #2 FAILED at 70. > > Hunk #3 FAILED at 101. > > Hunk #4 FAILED at 159. > > Hunk #5 FAILED at 292. > > 5 out of 5 hunks FAILED -- saving rejects to > > src/report/standard-reports/register.scm.rej > > > > > > > > -- > Robert > _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
