[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patch-testing-problem
From: |
Thomas Morley |
Subject: |
Re: Patch-testing-problem |
Date: |
Sat, 29 Sep 2012 01:22:21 +0200 |
2012/9/28 James <address@hidden>:
> Hello,
>
> On 28 September 2012 21:24, Thomas Morley <address@hidden> wrote:
>> Hi,
>>
>> I wanted to test Marc's bar-line-patch somewhat closer, but I have a
>> problem, not knowing what to do.
>>
>> I did (because I don't know what went wrong I post every detail):
>>
>> 1. Downloaded the patch from Rietveld and stored it in `0001-bar-line.patch'
>>
>> 2. To get the newest lily-source-code (I'm using LilyDev), not
>> affected from any other work I might have done, I typed in terminal:
>> cd lilypond-git/
>> git reset --hard HEAD
>> git clean -f
>>
>> cd build/
>> make clean
>> make doc-clean
>> make test-clean
>>
>> Updating source using "LilyDPond Contributer's Interface" of LilyDev
>>
>> 4. Building lilypond with
>> ../configure
>> make
>>
>> 5. Establishing test-base-line via
>> make test-baseline
>>
>> 6. Back to lilypond-git/ I tried applying the patch with
>> git apply --index 0001-bar-line.patch
Hi James,
thanks for your reply.
But sorry, I don't understand.
> I just download the diff
I downloaded
http://codereview.appspot.com/download/issue6498052_24001.diff
and stored it in a file, naming it `0001-bar-line.patch', in
(First step of my list)
> and in the top level of $LILYPOND_GIT you
> cannot do it in $LILYPOND_GIT/build you have to be in the top level
I thought I _was_ in the top level.
I opened a new terminal and typed
cd lilypond-git/
The terminal returns:
address@hidden ~/lilypond-git (dev/local_working)$
Isn't it the top level?
> patch -p1 < [path to issue*.diff]
I don't know what to do with this command.
As I wrote before I tried to use
git apply --index 0001-bar-line.patch
which returned all the errors.
BTW, some time ago I created a silly patch for testing-purpose (stored
as 0002-bla.patch)
And I had no problems to apply him again with
git apply --index 0002-bla.patch
Seems I need some advice for dummies.
-Harm
P.S.
0002-bla.patch:
>From 4e3c774bf268decc3dc1ec0145fc74d77b5b3259 Mon Sep 17 00:00:00 2001
From: Thomas Morley <address@hidden>
Date: Mon, 16 Jul 2012 15:34:27 +0200
Subject: [PATCH 2/2] bla
blabla
---
scm/define-markup-commands.scm | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 0f53296..718c78e 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -113,6 +113,7 @@
(define-public empty-stencil (ly:make-stencil '() '(1 . -1) '(1 . -1)))
(define-public point-stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
+(define-public null-stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; geometric shapes
--
1.7.0.4