-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kesavan T.S wrote: > Hi Mark, > Thanks a lot for your response.I would really appreciate any tips for > writing a script for auto propagation of a fix in prod level branch to > future releases. When ever a commit is made I want to look up upstream > branches for these files and in a temp directory do a update -j if the > merge is successful commit it on the branch otherwise lookup users email > and send a notification for merge.
I think this is a bad idea. Just because a merge does not produce conflicts does *not* mean that the merge was successful. I have seen, for example, a new function added to source code on both the branch and the trunk. For various reasons, the new function was not merged, but copied-and-pasted from the branch to the trunk. Unfortunately, in the branch the function appeared at the beginning of the file, and on the trunk, it appeared at the end of the file. CVS merged the files without complaint, but compiling it (it was C++, not Java) produced errors. This is only one small example of the kind of thing that can go wrong with a merge, which CVS cannot detect. - -- Jim Hyslop Dreampossible: Better software. Simply. http://www.dreampossible.ca Consulting * Mentoring * Training in C/C++ * OOD * SW Development & Practices * Version Management -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFEQGoaLdDyDwyJw+MRApcKAJwN6Dr8cQoJNcSer4ABSQ35IBnKvgCgxqO0 kg2njG0XXDDAJmfmDAXI9Jk= =Du2d -----END PGP SIGNATURE----- _______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
