From kde-kimageshop Mon Mar 27 13:31:04 2006 From: Boudewijn Rempt Date: Mon, 27 Mar 2006 13:31:04 +0000 To: kde-kimageshop Subject: Re: Please forwardport Message-Id: X-MARC-Message: https://marc.info/?l=kde-kimageshop&m=114346627219151 On Mon, 27 Mar 2006, John R. Culleton wrote: > On Monday 27 March 2006 04:41, Cyrille Berger wrote: > > > Please forward port all bugfixes and features from 1.6 to trunk for the > > > time being -- or else, keep track carefully of what you've been doing > > > (for instance, by creating patches and keeping them apart). Otherwise, > > > the merging will be hell later on. > > > > for those who wonder how to do it, in the branch where the bugfixes and > > features weren't made, it is as easy as: > > > > svn diff path/to/koffice/branch/with/modifications | patch > > It is a convention in some projects that unstable branches are > given odd numbers and stable even numbers. Which if any will be > the stable branch of Krita, 1.5 or 1.6? > We don't have that conventionat. Both branches are stable: 1.5 will contain bugfixes for the 1.5 release series, and 1.6 will contain new features and will be released September/October. 1.6 will still be based on Qt3; trunk is right now being converted to Qt4. Boudewijn _______________________________________________ kimageshop mailing list kimageshop@kde.org https://mail.kde.org/mailman/listinfo/kimageshop