Re: Merge to branch
Hello, "Jim.Hyslop" <[EMAIL PROTECTED]> a écrit dans le message de news:[EMAIL PROTECTED] > Fixing this will be quite simple. For simplicity, I will assume that there ... Thank you very much for this method. I didn't know it was possible to merge 2 versions in the same branch. I have to read some docs to be more familiar with cvs (wincvs don't help, the help is a shame). Cordialement. Jean ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Merge to branch
Hello, "Rohan Nandode" <[EMAIL PROTECTED]> a écrit dans le message de news:[EMAIL PROTECTED] > If both main trunk and branch R18 are in sync till now, then you can > merge the changes with following with branch as working copy. > > cvs update -j HEAD -j R18 Thank you very much. It was the main trunk name (HEAD) I didn't know ! It worked. Jean ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Merge to branch
Hello, I have a "main trunk" and a branch "R18". Some changes (on 3 files) have been made by programmer on the main trunk but they should have been done in the R18 branch. I'd like the changes made on the three files to be merged (or just copied) to the R18 branch. Of course, the R18 branch should continue to "live" but with the changes (I hope my english is good enougth...). Thanks. Jean ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
[MANIACOSEX.COM] Ajoutez vos sites et galeries !
Bonjour, Ce message s'adresse a tous les webmasters X. Vous pouvez dès a présent inscrire votre site, vos galeries photos et vidéos sur notre annuaire International du Sex MANIACOSEX.COM Version française : http://www.fr.maniacosex.com/html/sommaire.cfm English version : http://www.uk.maniacosex.com/html/sommaire.cfm Versión española : http://www.sp.maniacosex.com/html/sommaire.cfm Deutsche Version : http://www.de.maniacosex.com/html/sommaire.cfm Rejoignez l'un des futurs plus grands portails du Sex et systèmes TGP du WEB. Notre site fera grimper, grimper, grimper votre audience... A très bientôt. Si vous ne souhaitez plus recevoir nos messages Cliquez ici pour vous désabonner : http://www.fr.maniacosex.com/html/mailing.cfm?[EMAIL PROTECTED]&state=remove ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs