Hello, I want to store upstream sources in their respective branches in order to be able to merge the changes automatically into HEAD. There is some info in the tutorials and mailing list archives, but after some attempts I'm still confused about how this works.
I want to have the following vendors: LINUS, RMK, PXA, MYHWVENDOR. With the main trunk, this yields a total of five branches existing simultaneously. After I get a new version, I want to save it into its branch and merge with HEAD. I start with cd linux.orig cvs import -m . linux LINUS linux_2_4_19 After that, I see two possibilities: 1. Either cvs co linux cd linux cvs tag before-rmk cvs tag -b RMK patch -p1 <../rmk7.diff cvs ci -m . cvs tag linux_2_4_19-rmk7 cvs tag before-pxa ... and so on for linux_2_4_19-rmk7-pxa1 and linux_2_4_19-rmk7-pxa1-myhwvendor_1_0_2. Updating each branch happens through checking it out with a sticky tag, applying the patch, committing and tagging. 2. Or cd linux-rmk7 cvs import -b <new branch number> RMK linux_2_4_19-rmk7 cd ../linux-rmk7-pxa1 ... and so on for linux_2_4_19-rmk7-pxa1 and linux_2_4_19-rmk7-pxa1-myhwvendor_1_0_2. Updating each branch happens through importing the new version with its tag into the respective branch, as described in Cederqvist. The first method has obvious disadvantages that I have to remove $Id$ hunks from the upstream patches and keep track of added or removed files. The problem with the second approach is that I don't understand which version to give to -b during the first import of RMK, PXA, and MYHWVENDOR. As I understand it, these branches shouldn't fork from the HEAD, they should be descendants of their respective upstream with root at LINUS, like this: linux_2_4_19-rmk7-pxa1 (revision: 1.1.1.1.2.1.2.1) PXA (branch: 1.1.1.1.2.1.2) linux_2_4_19-rmk7 (revision: 1.1.1.1.2.1) RMK (branch: 1.1.1.1.2) linux_2_4_19 (revision: 1.1.1.1) LINUS (branch: 1.1.1) and so on. However, when I try to create such branches per hand and then import to them, cvs says "Only branches with two dots are supported: 1.1.1.1.2". What is the best way to proceed? I would appreciate any help. And another question: is there a way to make cvs diff -u skip the hunks with $Id$, $Log$ and so on? Thanks in advance, Baurzhan. _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
