On Thursday 05 May 2005 03:50 am, Christian Perrier wrote: > I have commited it in the stable branch. There's not guarantee that it > will make it to sarge because of the freeze though. But, anyway, this > update will be used as a base when Daniel will switch to 0.3 versions.
At the moment I've been ignoring the .po file updates when merging between branches, because they cause lots of conflicts that I can't figure out how to resolve. Would it work to just copy the .po files directly between branches and then run msgmerge? (i.e., not try to get svn to merge them) Daniel -- /------------------- Daniel Burrows <[EMAIL PROTECTED]> ------------------\ | You know you've been sitting in front of your Lisp machine too long | | when you go out to the junk food machine and start wondering how to | | make it give you the CADR of Item H so you can get that yummie | | chocolate cupcake that's stuck behind the disgusting vanilla one. | \- Does your computer have Super Cow Powers? ------- http://www.debian.org -/
pgpxq2pMV7PzB.pgp
Description: PGP signature
