Stirnweiss, Siegmund SZ/HZA-ZIT3 wrote:
>We use tags in CVS to identify the files which have passed module tests
>and should make it into our integration test environment. When they have
>passed the integration tests we use a different tag to identify the
>files, which make up the software in/for our production environment.
if I read that (and the rest of the thread) correctly, that sound like
an 'unstable trunc' -> 'QA branch' -> 'stable branch' eapproach.
normally you would propagate changes from trunc to QA-branch and from
there to the stable-branch via merging, but if you don't do cherry
picking at all, you also could replace the file in the branch by a
fresh copy from trunc (or QA-branch respectively).
Normally that requires a svn delete followed by a svn copy resulting
in two commits, but if you are working from the command line you can
use svnmucc to do it in one commit.
Received on 2011-04-04 08:31:45 CEST