Re: oops! I've changed files in the `snippet' directory

2011-08-22 Thread Graham Percival
On Sun, Aug 21, 2011 at 07:53:35AM +0200, Werner LEMBERG wrote: I think the commit message is enough for that? LSR: local import LSR: full import ? Is the format of this commit message fixed? I'm asking because a script might search for it. No, because we don't have any fixed people

Re: oops! I've changed files in the `snippet' directory

2011-08-20 Thread Graham Percival
On Fri, Aug 19, 2011 at 10:29:12AM +0200, Werner LEMBERG wrote: No, it is not safe. Your changes will be elminated the next time Neil (or Valentin, or anybody who cares about LSR) does a full import. Historically, this only happens every 3-4 months, but it should be happening much more

Re: oops! I've changed files in the `snippet' directory

2011-08-20 Thread Werner LEMBERG
(2) The next time makelsr gets called, start with the status at commit 12345678 as a base, *not* with HEAD. Doing so, later fixes to the snippets within lilypond's git repository are saved. can you do this automatically in a python script, assuming a complete ignorance of git

Re: oops! I've changed files in the `snippet' directory

2011-08-20 Thread Graham Percival
On Sun, Aug 21, 2011 at 06:55:02AM +0200, Werner LEMBERG wrote: I think it's overkill, though. Is it? You want to silently override fixes to the better? If somebody edits a file specifically marked %% DO NOT EDIT this file manually; it is automatically %% generated from LSR

Re: oops! I've changed files in the `snippet' directory

2011-08-20 Thread Werner LEMBERG
Is it? You want to silently override fixes to the better? If somebody edits a file specifically marked %% DO NOT EDIT this file manually; it is automatically %% generated from LSR http://lsr.dsi.unimi.it ? Hehe, you have a point. BTW, what about using git tags to mark the commits used

Re: oops! I've changed files in the `snippet' directory

2011-08-19 Thread Neil Puttock
On 18 August 2011 22:46, Reinhold Kainhofer reinh...@kainhofer.com wrote: BTW, I managed to get the LSR-copy running on my machine: http://lsr.kainhofer.at/LSR/ (the jail is set up but not yet used for compiling) HOWTO as usual at http://wiki.kainhofer.com/lilypond/lsr_setup Wow, that's

oops! I've changed files in the `snippet' directory

2011-08-18 Thread Werner LEMBERG
Folks, while doing some doc fixes I've also changed files directly in the `snippet' directory by accident. But this is not me alone, others do the same :-) My question: Is this really a problem? Are such fixes lost if someone is running makelsr? Or is someone taking care of such fixes,

Re: oops! I've changed files in the `snippet' directory

2011-08-18 Thread Graham Percival
On Thu, Aug 18, 2011 at 08:09:29AM +0200, Werner LEMBERG wrote: My question: Is this really a problem? Are such fixes lost if someone is running makelsr? Depends, and yes. Files are completely rewritten from a makelsr import. Whether or not this is a problem depends on the changes that

Re: oops! I've changed files in the `snippet' directory

2011-08-18 Thread Werner LEMBERG
My question: Is this really a problem? Are such fixes lost if someone is running makelsr? Depends, and yes. Hmm, hmm, hmm. Files are completely rewritten from a makelsr import. Whether or not this is a problem depends on the changes that you've been making. Well, I consider it a

Re: oops! I've changed files in the `snippet' directory

2011-08-18 Thread Reinhold Kainhofer
Am Donnerstag, 18. August 2011, 08:25:48 schrieb Graham Percival: It's really tedious to add fixed files to the `new' directory... This might be made easier with a script, or at least if we cleared out the old stuff from that new directory. Unfortunately, nobody is willing to demonstrate

Re: oops! I've changed files in the `snippet' directory

2011-08-18 Thread Graham Percival
On Thu, Aug 18, 2011 at 09:59:32AM +0200, Werner LEMBERG wrote: Files are completely rewritten from a makelsr import. Whether or not this is a problem depends on the changes that you've been making. Well, I consider it a `problem' if fixes get completely overwritten by non-fixed