[TYPO3-core] TYPO3_4-0-0 tagged in CVS / merge back to HEAD?

[Dmitry Dulepov]

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

Hi!

Michael Stucki wrote:
> The next step will be to merge the contents of the TYPO3_4-0 branch back to
> HEAD. I've often cross-checked it and just did so again: There are no
> differences between HEAD and the version when we created the branch. So it
> should be very easy to merge the contents back, right?
> 
> Andreas, I would be happy if you could help here. Is there an easy way to
> copy all contents back into HEAD (now that several files have been moved,
> added, etc.)

I do not understand why these branches are needed at all. There should
be tags in the HEAD for each version. If one has to do parallel
development (like 3.8.1 for 3.8 while 4.0 goes on in HEAD), he should
branch from that tag and continue in the new branch. Main development
should go in HEAD.

Dmitry.
- --
"It is our choices, that show what we truly are,
far more than our abilities." (A.P.W.B.D.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)

iD8DBQFENmNrRVcYnKJ8N6kRAog4AKCtpnqa1RJJ+New9abM9c8mGIbluwCfZbkb
Apev0an3GK4ESqNwKRMkhis=
=I6KU
-----END PGP SIGNATURE-----