[Kstars-devel] Merging from the unfrozen branch

[Jason Harris]

Basically, what I'm saying is that none of the changes I've made to
unfrozen can be ported to trunk because of the feature freeze.

I had been planning to not worry about syncing either of the branches
until after 4.1 is released, but maybe we should make an effort to
port bugfixes from trunk to both branches, just to make the eventual
big merges easier (because all of the changes would be one way, branch
to trunk).

On Fri, Jun 27, 2008 at 4:45 PM, Akarsh Simha <akarshsimha at gmail.com> wrote:
>
>> Changes should only be made to unfrozen if they can't be made to trunk
>> because of the freeze.  So there's no need to port changes from
>> unfrozen to trunk unless someone screwed up...
>
> But now that the freeze on bugfixes is lifted, shouldn't we be porting
> the bugfixes and feature-polishings commited to unfrozen into the
> trunk?
>
> Regards
> Akarsh
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
>
> iD8DBQFIZXuwkAo+aFFLL8MRAtTAAJ4uDRfjnGWxZzEeeEuJkC6aaAAyuQCdGwiz
> h/N0Na0n2dpz4OSCBYRobpk=
> =zCUZ
> -----END PGP SIGNATURE-----
>
> _______________________________________________
> Kstars-devel mailing list
> Kstars-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kstars-devel
>
>