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

Michael Stucki michael at typo3.org
Mon Apr 10 10:15:27 CEST 2006


Hi Dmitry & Andreas,

> Andreas Otto wrote:
> > Sould be easy. Have a look at the chapter "Merging Changes From Branch To
> > Trunk" [1] from the book "Open Source Development with CVS", this might
> > help you.
>
> Well, if there were no changes in the HEAD, official CVS manual has an
> answer. It is generally checking out from HEAD, updating from another
> branch and comitting to HEAD if I remember correctly. Should be quite
> easy if CVS is alive ;)

Of course. The problem is just that a lot of files have been removed (dmailer 
class), moved (gfx) or added (e.g. t3skin). I thought there is an easy way to 
adapt this from the 4.0 branch...

Will check the manual later, I hope there is a solution for this.

- michael
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
Url : http://lists.netfielders.de/pipermail/typo3-team-core/attachments/20060410/20595550/attachment.pgp 


More information about the TYPO3-team-core mailing list