Still no joy.
Following the reading of yet more documentation I see that this should work:
1) 'import' openacs-4-6 to a blank repository and tag it openacs-4-6
2) change some files and commit the changes
3) 'import' openacs-4-6-3
4) do 'cvs checkout -j etc...'
I think that my problem is that I am trying to:
1) 'import' openacs-4-6 to a blank repository and tag it openacs-4-6
2) 'import' openacs-modified and tag it openacs-mod
3) 'import' openacs-4-6-3 and tag it openacs-4-6-3
4) merge it with 'cvs checkout -j ....etc
So I never actually commit any changes - but surely there must be a way to reconcile two branches after having imported them!?
I am going to try creating a branch based at my openacs-4-6 import point :
cvs rtag -r openacs-4-6 -b openacs-modified openacs
and then update the main trunk, and then merge the branch back in - but I don't yet know how to specify where I want the import to go (trunk or branch).
I will post a log output next time I have the three revisions in the cvs.
Many thanks for your help - I really appreciate it.
Regards
Richard
