Re: [Fenfire-dev] Viikontak ainen päivitys

[Tuomas Lukka]

On Wed, Oct 15, 2003 at 12:46:39PM +0300, Asko Soukka wrote:
> keskiviikkona, 15. lokakuuta 2003 klo 12:05, Tuomas Lukka kirjoitti:
> > On Wed, Oct 15, 2003 at 12:25:22AM +0300, Asko Soukka wrote:
> > > maanantaina,  6. lokakuuta 2003 klo 09:22, Tuomas Lukka kirjoitti:
> > > > > > Mut entäs muut? Esim. ne luokkien nimet?
> > > > ConstructorParameter_float jne, eli suurella kirjaimella alkavaksi
> > > > ja sanomaan, että kyse on *konstruktori*parametrista.
> > > 
> > > Ok, now there should be
> > > 
> > >   address@hidden/fenfire--humppake--0.1--patch-3
> > > 
> > > at himalia:/home/atsoukka/{archives}/
> > > 
> > > But even this patch need some tuning. I had modified Makefile (added
> > > my own targets for my own spaces), but I didn't managed to restore it
> > > correctly before creating patch. I hope you can live with that, when
> > > merging.
> > 
> > Have you marked them in the makefile as your private stuff?
> > If yes, then no problem.
> 
> Well, I thought I had removed my changes, but arch still added some
> changes to Makefile into patch. Can you exclude Makefile when patching?

No, I can't, really. Easiest would be if you check what's in there in that 
version
and adjust it and re-commit and I merge from *that* version instead. Sound ok?

BTW: please star-merge first, it makes my job easier.

> Hmm.. it's time for me to lear a new arch command. What corresponds to
> cvs diff?

tla what-changed --diffs

You should use it ALWAYS before committing.

        Tuomas