Re: [Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Chris Cormack
Also a neat tool is git-stash, for when you are in the situation and you think you might want your changes in the future even if you don't know http://www.kernel.org/pub/software/scm/git/docs/git-stash.html Chris On Wed, May 21, 2008 at 5:15 AM, Mason James <[EMAIL PROTECTED]> wrote: > > On 200

Re: [Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Mason James
On 2008/05/21, at 3:00 AM, Zeno Tajoli wrote: > Hi, > > At 09.36 20/05/2008, Paul POULAIN wrote: >> Zeno Tajoli a écrit : >>> koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl: needs >>> update >>> fatal: Entry >>> 'koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl' not upto >>> d

Re: [Koha-devel] Question about Duplicating Cataloging Fields

2008-05-20 Thread Bernard Shiundu
Good of you to raise this. I for one would also like to get a blank field when hitting the plus sign and an option of simply deleting a field - though I do know that for fields which are not mandatory - it is enough to leave it blank and it will 'disappear' on save which is how I've been working

[Koha-devel] Questions Koha 3

2008-05-20 Thread C W Nel
Can anyone please comment on the following user questions? 1.. Can overdue notices be processed in batches? 2.. Can overdue notices be sent by email? 3.. Is there any SMS option for overdue notices 4.. Can templates be created for overdue notices, so that just the person's name and d

[Koha-devel] Patron card label generator broken

2008-05-20 Thread Bernard Shiundu
Oops forgot the most important bit!! I'm running 3.00.00.085 with Perl 5.008008. From: Bernard Shiundu Sent: Tuesday, May 20, 2008 7:02 PM To: Developers Koha (Koha-devel@lists.koha.org) Subject: Patron card label generator broken Don't know If its just me but the patron card label generator se

[Koha-devel] Patron card label generator broken

2008-05-20 Thread Bernard Shiundu
Don't know If its just me but the patron card label generator seems broken to me. When I click on 'new patron card batch' I get only the box showing the active settings and now option to add a batch .. I'm a tad swamped to actually investigate this, but anyone else seen this ?? don't want to pos

Re: [Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Galen Charlton
Hi, On Tue, May 20, 2008 at 10:00 AM, Zeno Tajoli <[EMAIL PROTECTED]> wrote: > thank you for the information. > In fact I want to discard the changes, can I do this operation with git ? > Is there a command like 'git discard' ? Yes: git checkout name_of_modified_file will discard the local chan

Re: [Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Zeno Tajoli
Hi, At 09.36 20/05/2008, Paul POULAIN wrote: >Zeno Tajoli a écrit : >>koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl: needs update >>fatal: Entry >>'koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl' not upto >>date. Cannot merge. > >It means you have modified opac-dictionary.tmp

[Koha-devel] git stats

2008-05-20 Thread Paul POULAIN
Hello, I sometimes look at git.koha.org/gitstat/, it's a really usefull & great tool. The only thing I find strange is : http://git.koha.org/gitstat/chart.php, options "xxx (Koha release)". In the list, appears 22 very old CVS tags, and not the koha 3.0 alpha or beta (or master) branches. Is the

Re: [Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Paul POULAIN
Zeno Tajoli a écrit : > koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl: needs update > fatal: Entry > 'koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl' not upto > date. Cannot merge. It means you have modified opac-dictionary.tmpl locally, and git don't want/can't to pull/reba

[Koha-devel] a problem with configuration of git ?

2008-05-20 Thread Zeno Tajoli
Hi to all, from last 3 april 2008 I have a local copy of last version using git. I have done: git clone git://git.koha.org/home/pub/scm/koha.git kohaclone then every day: cd ../kohaclone git pull and I have received the updates. But today I see: [EMAIL PROTECTED] ~/Documen