To: discussions about usage and development of dia <dia-list gnome org>
Subject: Re: Prerelease of 0.94 is out
Date: Sat, 17 Jul 2004 20:52:39 +0200
On Tue, 2004-07-13 at 16:20, Steffen Macke wrote:
> Christophe,
>
> thanks for pointing this out.
> The problem was once again that the files were added
> as text files to the CVS while they are binaries (gzip-compressed)
>
> I've fixed this on CVS HEAD.
> Lars: Could you move over the
> files to the 0_94_RELEASE branch?
Done.
> And eventually tell us
> which cvs magic has to be applied to do such things?
For things that involve adding and removing files, it has to be done by
hand. When applying a patch or fixing something yourself, here's what I
do:
Get it all ready in the main branch, and make sure nothing other than
the stuff you want transferred is modified in your checkout (cvs update
will tell you what updated). Then (assuming the 0.94 checkout is in
../dia-0.94) do this:
cvs diff -u | patch -p0 -d ../dia-0.94
There's also true CVS magic to transfer between branches which involves
update with -j option. I'm still learning bits and pieces, but I'll
have to do this for the .po files soon.
-Lars