'Re: Updates to the website'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lilypond-devel
Subject:    Re: Updates to the website
From:       Till Rettig <till.rettig () gmx ! de>
Date:       2007-06-19 16:17:05
Message-ID: 46780181.7040802 () gmx ! de
[Download RAW message or body]

Ok, one more try! I send the patch for master/web branch, made with 
git-diff -p . Then another patch corrects some mistakes in the web-page 
browser-language.thml. The third patch is for the documentation tree, 
updated the change Graham did recently.

I just saw some mistakes after building the page and changed them. Then 
I tried to build the manual diff with git-diff -p again, but there comes 
no output this time. Well, I send you this later update as a normal 
patch formatted with git format-patch.
I really don't know what this is: I made sometimes obviously a mistake 
not commiting something or that kind of thing. After that I cannot get 
the repository clean again. With the translation repository I was just 
anxious not to do any mistakes, so that's why this is still clean.

Greetings
Till

John Mandereau wrote:
> Le dimanche 10 juin 2007 Ă  12:57 +0300, Till Rettig a ĂŠcrit :
>   
>> Hi,
>>
>> after some busy time I investigated the problem again today and git
>> suggested me a merge, after which I could pull successfully. Then I
>> reset my branch to the current commitish of the remote branch
>> (web/master) and commited my changes (including the actual commitish).
>> I hope this will finally work now!
>>     
>
> No, it doesn't; git-am says
>
> error: patch failed: de/about/browser-language.html:65
> error: de/about/browser-language.html: patch does not apply
> Patch failed at 0001.
>
>
> Don't forget that if you don't manage to make a clean patch with
> git-format-patch, make a patch with "git-diff -p".
>
> Good luck
> John
>
>   

[Attachment #3 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=UTF-8" http-equiv="Content-Type">
  <title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Ok, one more try! I send the patch for master/web branch, made with
git-diff -p . Then another patch corrects some mistakes in the web-page
browser-language.thml. The third patch is for the documentation tree,
updated the change Graham did recently.<br>
<br>
I just saw some mistakes after building the page and changed them. Then
I tried to build the manual diff with git-diff -p again, but there
comes no output this time. Well, I send you this later update as a
normal patch formatted with git format-patch.<br>
I really don't know what this is: I made sometimes obviously a mistake
not commiting something or that kind of thing. After that I cannot get
the repository clean again. With the translation repository I was just
anxious not to do any mistakes, so that's why this is still clean.<br>
<br>
Greetings<br>
Till<br>
<br>
John Mandereau wrote:
<blockquote cite="mid1181552026.9949.19.camel@free.fr" type="cite">
  <pre wrap="">Le dimanche 10 juin 2007 Ă  12:57 +0300, Till Rettig a ĂŠcrit :
  </pre>
  <blockquote type="cite">
    <pre wrap="">Hi,

after some busy time I investigated the problem again today and git
suggested me a merge, after which I could pull successfully. Then I
reset my branch to the current commitish of the remote branch
(web/master) and commited my changes (including the actual commitish).
I hope this will finally work now!
    </pre>
  </blockquote>
  <pre wrap=""><!---->
No, it doesn't; git-am says

error: patch failed: de/about/browser-language.html:65
error: de/about/browser-language.html: patch does not apply
Patch failed at 0001.


Don't forget that if you don't manage to make a clean patch with
git-format-patch, make a patch with "git-diff -p".

Good luck
John

  </pre>
</blockquote>
</body>
</html>


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic