Merging trunk changes into branches

[Christian Stimming]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Phil Longstaff schrieb:
> Are there any guidelines on merging changes in trunk into a branch or
> changes from another branch into a branch?  Merging from the trunk
> would allow me to keep up with bug fixes and other changes and make
> the future merge back into the trunk easier.

The only existing guidelines concern the stable branch (branches/2.0).
For all other branches which are considered experimental work anyway,
the branch developers are completely free to decide for themselves when
to merge and what to merge.

For your gda-dev branch this means you should just go ahead and merge
whatever you consider an improvement for you. If you have any technical
questions on the appropriate SVN commands, don't hesitate to ask them
here or on IRC. The only recommendation we'd like to add is that you
should include the merged revision numbers in the commit message so that
you can look up easily which revision have been merged with which commit.

> Merging in other branches could make my job easier (e.g. certain
> aspects of the GObject branch would make the GDA branch easier) but
> would also add unwanted project dependencies, so my guess is that it
> would be frowned on.

For the separate development branches we pretty much don't care about
dependencies. Just use whatever makes your life easier.

Regards,

Christian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQCVAwUBRdVx72XAi+BfhivFAQLNKAQAn1XQEcSR0XFXE3MUR+92KA03K64zM1CU
+LkZ5riBpvvnQOHQzz863kgTJnjSb7cJbVc5yhGzldYjYtJlJOtt54WpUz8H7cpf
8PB8toHbsuFliafekQYPMMeUv5cx8GsH1pXP5UQHUTrICIFJsJw5thnPDgNUcQpy
wq7zW2KDOPI=
=kSuw
-----END PGP SIGNATURE-----